)]}' { "log": [ { "commit": "5972e52e15e075e40dfcdc3ffaed1b7c4e2afac1", "tree": "98dc34e6408e8f535e23f3766037372fa9247929", "parents": [ "07b88ea0acd44ecd317ce37eb4338e5b0d2b52b0", "53b070275568af0d1016e019fdf0aa1ed28665f1" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Sep 30 18:43:41 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Sep 30 18:43:52 2010 -0400" }, "message": "resolved conflicts for merge of 53b07027 to master\n\nChange-Id: Ia5ce86d84454a4be76e71aeb77942ba8d88d2700\n" }, { "commit": "53b070275568af0d1016e019fdf0aa1ed28665f1", "tree": "9855a81f778b28ad7e7e43a3de349518496b85c3", "parents": [ "c3bc8b7b08611c8d86919f4695430990bc6b475d", "727d67d4fb8721b0291312e4cca33927dfba0e31" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Sep 30 13:10:50 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 13:10:50 2010 -0700" }, "message": "am 727d67d4: Merge \"location: rebind to network location and geocoder services after package update\" into gingerbread\n\nMerge commit \u0027727d67d4fb8721b0291312e4cca33927dfba0e31\u0027 into gingerbread-plus-aosp\n\n* commit \u0027727d67d4fb8721b0291312e4cca33927dfba0e31\u0027:\n location: rebind to network location and geocoder services after package update\n" }, { "commit": "e97ae40dffe7d7f8917c51c4f3f6c1b18c238565", "tree": "ab233a6ed9a592d52aebdba9c024f181e5e52a5e", "parents": [ "2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed Sep 29 15:23:46 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Sep 30 15:25:54 2010 -0400" }, "message": "location: rebind to network location and geocoder services after package update\n\nChange-Id: I2d7db3512b9edd7e0ba27d97442967fc2278e3b9\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "d4c2a2f18728651c3d4191654389886cab5bf2bb", "tree": "1bc18fb8c236ab87d2c3c3e9001931191ea34666", "parents": [ "da5917ec359eeee04f83672958c10891afe01f16", "198297b495d975cd4889f5136cd69368bd319eed" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Wed Sep 29 22:13:21 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 29 22:13:21 2010 -0700" }, "message": "am 198297b4: am f01a8730: Merge \"Revert \"Revert \"Check for the DEVICE_POWER permission in userActivity.\"\"\" into gingerbread\n\nMerge commit \u0027198297b495d975cd4889f5136cd69368bd319eed\u0027\n\n* commit \u0027198297b495d975cd4889f5136cd69368bd319eed\u0027:\n Revert \"Revert \"Check for the DEVICE_POWER permission in userActivity.\"\"\n" }, { "commit": "ea7ee3f4d31b92828df005d021cf482f6332514a", "tree": "ed11714fecc0d80a440b9c20077da91bc01a3a8a", "parents": [ "3ebb1ba50c9b98e5303eb21ed6fa488c3f9bd632", "8bd545ab4f7e75634c970b50ed15c20858d6ac0c" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 29 17:17:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 29 17:17:22 2010 -0700" }, "message": "am 8bd545ab: am 212d81a0: Merge \"Move all the permissions check up for unmount\" into gingerbread\n\nMerge commit \u00278bd545ab4f7e75634c970b50ed15c20858d6ac0c\u0027\n\n* commit \u00278bd545ab4f7e75634c970b50ed15c20858d6ac0c\u0027:\n Move all the permissions check up for unmount\n" }, { "commit": "4715bd91f5949a1919156a5a5cb50f0cccda645e", "tree": "75e45e380c7208467ac6d29ba79a0ff3806c4f76", "parents": [ "856f2859e8550c274c7fe3f05b971bf34bdcb525", "f4c3b7e916b417fabb468ec0a565dc79cd7ba2b3" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Wed Sep 29 12:20:51 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Wed Sep 29 12:20:51 2010 -0700" }, "message": "resolved conflicts for merge of f4c3b7e9 to master\n\nChange-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4\n" }, { "commit": "198297b495d975cd4889f5136cd69368bd319eed", "tree": "dd3e822c61014e0f751069a133b8c8e9a2576204", "parents": [ "b4a28f24263fbccce4b77b47c2f3ddac63a8a75f", "f01a873029641da2155ca1882f311d8f4e92675a" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Wed Sep 29 11:02:55 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 29 11:02:55 2010 -0700" }, "message": "am f01a8730: Merge \"Revert \"Revert \"Check for the DEVICE_POWER permission in userActivity.\"\"\" into gingerbread\n\nMerge commit \u0027f01a873029641da2155ca1882f311d8f4e92675a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f01a873029641da2155ca1882f311d8f4e92675a\u0027:\n Revert \"Revert \"Check for the DEVICE_POWER permission in userActivity.\"\"\n" }, { "commit": "0c32c09cd3a99a7f397313048ecf9d4c5afaaa91", "tree": "b7832ebcdc5f0af9d1c20236638106f93f0d4d79", "parents": [ "212d81a004f50e51ed8f6d803b79f4b71546b351" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Wed Sep 29 10:20:59 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Wed Sep 29 10:20:59 2010 -0700" }, "message": "Revert \"Revert \"Check for the DEVICE_POWER permission in userActivity.\"\"\n\nThis reverts commit 4da4827504df019d4e64dd864f70526ff6d384a0.\n" }, { "commit": "8bd545ab4f7e75634c970b50ed15c20858d6ac0c", "tree": "ae6b0ab53c517081ea4d25aeb3d15b63b704e7be", "parents": [ "f4c3b7e916b417fabb468ec0a565dc79cd7ba2b3", "212d81a004f50e51ed8f6d803b79f4b71546b351" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 29 07:53:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 29 07:53:06 2010 -0700" }, "message": "am 212d81a0: Merge \"Move all the permissions check up for unmount\" into gingerbread\n\nMerge commit \u0027212d81a004f50e51ed8f6d803b79f4b71546b351\u0027 into gingerbread-plus-aosp\n\n* commit \u0027212d81a004f50e51ed8f6d803b79f4b71546b351\u0027:\n Move all the permissions check up for unmount\n" }, { "commit": "212d81a004f50e51ed8f6d803b79f4b71546b351", "tree": "7b9e1538515bf21c215ec1cdff811e5105da6c18", "parents": [ "038cabe0247ee46df62f9363f1a303bc5b9c1028", "f1121dc1d35c7e8c317c278aad0dd4ad1358d870" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 29 07:40:32 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 29 07:40:32 2010 -0700" }, "message": "Merge \"Move all the permissions check up for unmount\" into gingerbread" }, { "commit": "f1121dc1d35c7e8c317c278aad0dd4ad1358d870", "tree": "328181f28c37eb9113ad04035f9dfa70a1df2ad0", "parents": [ "05105f7abe02b2dff91d6260b3628c8b97816bab" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 29 07:30:53 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 29 07:38:55 2010 -0700" }, "message": "Move all the permissions check up for unmount\n\nWe have already scanned the state of the OBB in mountObb, so check the\ncaller against the stored state in the unmountObb call. This allows us\nto ensure the calling binder is the same one that mounted it since we\ntie the lifecycle of the OBB to the lifecycle of the binder.\n\nChange-Id: I45d9cfbab5d3f5b37a6a9b594b10bd8b91cccc45\n" }, { "commit": "f4c3b7e916b417fabb468ec0a565dc79cd7ba2b3", "tree": "cd2bf75a03b260858cbeb78ea6d54a7f0dfdf8d2", "parents": [ "10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de", "038cabe0247ee46df62f9363f1a303bc5b9c1028" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Tue Sep 28 22:40:18 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 22:40:18 2010 -0700" }, "message": "am 038cabe0: NFC integration\n\nMerge commit \u0027038cabe0247ee46df62f9363f1a303bc5b9c1028\u0027 into gingerbread-plus-aosp\n\n* commit \u0027038cabe0247ee46df62f9363f1a303bc5b9c1028\u0027:\n NFC integration\n" }, { "commit": "038cabe0247ee46df62f9363f1a303bc5b9c1028", "tree": "11c6037442f85e0e7adad870ba9d8092323b6bf0", "parents": [ "d6877fa4971710150de20453bf4ba54dca863429" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Thu Sep 23 16:12:11 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Tue Sep 28 22:36:27 2010 -0700" }, "message": "NFC integration\n\nSource: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)\n\nConflicts:\n\n\tcore/java/android/app/ApplicationContext.java\n\tcore/java/android/provider/Settings.java\n\tcore/jni/Android.mk\n\tcore/jni/AndroidRuntime.cpp\n\tcore/res/AndroidManifest.xml\n\tinclude/utils/Asset.h\n\nChange-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "5d5bf48c9843231d55ded61f6ce50488ef280554", "tree": "ec4c59a9fa7c15f79a23d73113fcec585008b0f8", "parents": [ "d9bb688c91b5be6b7f065f02b9095787c452016e", "05e110506156a1b782232833b907afb428802b69" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Sep 28 20:21:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 20:21:48 2010 -0700" }, "message": "am 05e11050: am a25eabad: Merge \"Revert \"Check for the DEVICE_POWER permission in userActivity.\"\" into gingerbread\n\nMerge commit \u002705e110506156a1b782232833b907afb428802b69\u0027\n\n* commit \u002705e110506156a1b782232833b907afb428802b69\u0027:\n Revert \"Check for the DEVICE_POWER permission in userActivity.\"\n" }, { "commit": "05e110506156a1b782232833b907afb428802b69", "tree": "e146d2bfb011666cc799eb8a3ba6beebabe374cc", "parents": [ "ebfe5632db275a89b49ab828064ba90db59702cf", "a25eabad23d7b8fd430ada757ae4e9f2559f8845" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Sep 28 20:18:36 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 20:18:36 2010 -0700" }, "message": "am a25eabad: Merge \"Revert \"Check for the DEVICE_POWER permission in userActivity.\"\" into gingerbread\n\nMerge commit \u0027a25eabad23d7b8fd430ada757ae4e9f2559f8845\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a25eabad23d7b8fd430ada757ae4e9f2559f8845\u0027:\n Revert \"Check for the DEVICE_POWER permission in userActivity.\"\n" }, { "commit": "4da4827504df019d4e64dd864f70526ff6d384a0", "tree": "9f113536e7ece08989b6df693a0078dc8147cbe6", "parents": [ "3e94b94f56888acbd1f8deb23c05474baaf4fae3" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Sep 28 23:07:26 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Sep 28 23:07:26 2010 -0400" }, "message": "Revert \"Check for the DEVICE_POWER permission in userActivity.\"\n\nThe change broke SetupWizard and probably other apps\n\nThis reverts commit 059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.\n" }, { "commit": "7440fc2e0e0257043b967a80dceb0b33797d1d12", "tree": "ab5d1b25a7185deb19167f63eb6cd3957f9a1913", "parents": [ "3f03496ad97b5f60ab432bca2d17a3e07b4ade47" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Sep 27 17:04:14 2010 -0700" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Tue Sep 28 20:02:33 2010 -0700" }, "message": "Wifi: Update code for new BT Apis.\n\nChange-Id: I1deb0a9a1533958cdb79179bebd2d3b435b0b07c\n" }, { "commit": "3f03496ad97b5f60ab432bca2d17a3e07b4ade47", "tree": "23eaeae5b07ad5cd38a908f354480567d7d0f63e", "parents": [ "96a79830ea1ae3ab3d6d3cce2bd1397fcd40ea0e" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Sep 27 17:02:23 2010 -0700" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Tue Sep 28 20:02:12 2010 -0700" }, "message": "Update code for new BT APIs.\n\nChange-Id: I53aa17b6c2a5ee50d47df91960a7f997eb7b1107\n" }, { "commit": "bff405f91001237ec94ec64f86fa2370c4509559", "tree": "c492bfa8bacef42800f47b1638b1812275cecb6d", "parents": [ "e63f20b5fe373822758182226d7512859d8e8356", "d8e8186c887fe47977721315f439465771a96374" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Sep 28 18:16:50 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Sep 28 18:16:50 2010 -0700" }, "message": "resolved conflicts for merge of d8e8186c to master\n\nChange-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5\n" }, { "commit": "75a44c6196e19ef404be1eb3d61bfea2b23caf10", "tree": "4df6db2cd8ccabeeec6b19f6291fde30a70453aa", "parents": [ "3a7bbc4d58ba270a20692689e5ce8311100d3d72", "f5bdeba197aba659e2dd3849a5bdfba8826c036d" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Tue Sep 28 17:40:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 17:40:23 2010 -0700" }, "message": "am f5bdeba1: am ea2cf2f9: Merge \"Check for the DEVICE_POWER permission in userActivity.\" into gingerbread\n\nMerge commit \u0027f5bdeba197aba659e2dd3849a5bdfba8826c036d\u0027\n\n* commit \u0027f5bdeba197aba659e2dd3849a5bdfba8826c036d\u0027:\n Check for the DEVICE_POWER permission in userActivity.\n" }, { "commit": "d8e8186c887fe47977721315f439465771a96374", "tree": "ff89a03f9a84484e3573508da6c72ecfbc4b04d6", "parents": [ "f5bdeba197aba659e2dd3849a5bdfba8826c036d", "05105f7abe02b2dff91d6260b3628c8b97816bab" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Sep 28 17:33:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 17:33:47 2010 -0700" }, "message": "am 05105f7a: Update OBB API to include callbacks\n\nMerge commit \u002705105f7abe02b2dff91d6260b3628c8b97816bab\u0027 into gingerbread-plus-aosp\n\n* commit \u002705105f7abe02b2dff91d6260b3628c8b97816bab\u0027:\n Update OBB API to include callbacks\n" }, { "commit": "05105f7abe02b2dff91d6260b3628c8b97816bab", "tree": "f42676d818548d76b2c55045a1bcc4866d6feec1", "parents": [ "ea2cf2f936b03f1720bc43863e41c89ea2a7903a" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 22 17:29:43 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Sep 28 17:23:26 2010 -0700" }, "message": "Update OBB API to include callbacks\n\nAdd a callback for users of the StorageManager API to be able to receive\nnotifications when the requested operation completes for mountObb and\nunmountObb.\n\nAdd NDK API to get to ObbInfo like the Java API has.\n\nAlso update the docs for the API and remove the \"STOPSHIP\" comments.\n\nChange-Id: I23a4409c7f8b74d3169614beba920b4d667990a4\n" }, { "commit": "f5bdeba197aba659e2dd3849a5bdfba8826c036d", "tree": "35b35a0328f7587a324fbc62207b98a08b391d8f", "parents": [ "08a02039ee467b3ead2c2e6d3f687b9c70c7fbc8", "ea2cf2f936b03f1720bc43863e41c89ea2a7903a" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Tue Sep 28 17:22:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 17:22:09 2010 -0700" }, "message": "am ea2cf2f9: Merge \"Check for the DEVICE_POWER permission in userActivity.\" into gingerbread\n\nMerge commit \u0027ea2cf2f936b03f1720bc43863e41c89ea2a7903a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ea2cf2f936b03f1720bc43863e41c89ea2a7903a\u0027:\n Check for the DEVICE_POWER permission in userActivity.\n" }, { "commit": "059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c", "tree": "640a9017d3e59771ea2ea4990a62b913a77e1d49", "parents": [ "ab014a03a06a0044106ed9ad612b11e8197c8734" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Tue Sep 28 17:14:34 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Tue Sep 28 17:14:34 2010 -0700" }, "message": "Check for the DEVICE_POWER permission in userActivity.\n\nChange-Id: I6c8038a960bdf32dfad3b0571d86f51f87784370\n" }, { "commit": "e8fd1952089b98e63410e85f734b2727eeee1450", "tree": "643efe01a7d2a6de0a3ba2c38d68af3ee415e0f2", "parents": [ "1c730c87f3c729206d6f4bbabdfc88e1393b2eb6", "b763a6dc41dcce76585c56657903ae72c5422ae1" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Sep 28 13:58:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 13:58:12 2010 -0700" }, "message": "am b763a6dc: am 08cf57d7: Merge \"Fixes to granting URI permissions - take into account path perms.\" into gingerbread\n\nMerge commit \u0027b763a6dc41dcce76585c56657903ae72c5422ae1\u0027\n\n* commit \u0027b763a6dc41dcce76585c56657903ae72c5422ae1\u0027:\n Fixes to granting URI permissions - take into account path perms.\n" }, { "commit": "b974d0c8f21000354bec04dea9cc6c938cdccccd", "tree": "6271ba7357278cf677a3dac1731f93bf7af92427", "parents": [ "8aeeda9123783807a5dcb44133dc30b94ea7be1e", "6db6468956fa6d71d68e410a532ed7b1bcaecf74" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Tue Sep 28 13:20:43 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 13:20:43 2010 -0700" }, "message": "am 6db64689: am c89dd54c: Remove logging on wifilock acquire/release\n\nMerge commit \u00276db6468956fa6d71d68e410a532ed7b1bcaecf74\u0027\n\n* commit \u00276db6468956fa6d71d68e410a532ed7b1bcaecf74\u0027:\n Remove logging on wifilock acquire/release\n" }, { "commit": "b763a6dc41dcce76585c56657903ae72c5422ae1", "tree": "0a83501447a4970cadef6745a6e07b34c27cbd74", "parents": [ "6db6468956fa6d71d68e410a532ed7b1bcaecf74", "08cf57d791e50ecafe2728a7617a6487aeb6d6d5" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Sep 28 11:32:38 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 11:32:38 2010 -0700" }, "message": "am 08cf57d7: Merge \"Fixes to granting URI permissions - take into account path perms.\" into gingerbread\n\nMerge commit \u002708cf57d791e50ecafe2728a7617a6487aeb6d6d5\u0027 into gingerbread-plus-aosp\n\n* commit \u002708cf57d791e50ecafe2728a7617a6487aeb6d6d5\u0027:\n Fixes to granting URI permissions - take into account path perms.\n" }, { "commit": "08cf57d791e50ecafe2728a7617a6487aeb6d6d5", "tree": "634a04289805b98a85dcc255860c08411180989e", "parents": [ "c89dd54ceeec99173d51d1196e2c03a58f120211", "48058e8536f93543bf962b3af2bea985422fa868" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Sep 28 11:21:27 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 28 11:21:27 2010 -0700" }, "message": "Merge \"Fixes to granting URI permissions - take into account path perms.\" into gingerbread" }, { "commit": "48058e8536f93543bf962b3af2bea985422fa868", "tree": "ac5f066742429bcc7f7ee45175eac4b3d9062bab", "parents": [ "68ef7f3c3a8deb0e14b0b6325876b23cecc191b3" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 27 16:53:23 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Sep 28 11:20:21 2010 -0700" }, "message": "Fixes to granting URI permissions - take into account path perms.\n\nChange-Id: I8073061a578eda90dadd3b0b909047aae0d64f2d\n" }, { "commit": "6db6468956fa6d71d68e410a532ed7b1bcaecf74", "tree": "693399522a72b26b546c412689d3b8ad52407d2d", "parents": [ "cb6f29ebc6a8cde6ed600d233e23b962d06ea43f", "c89dd54ceeec99173d51d1196e2c03a58f120211" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Tue Sep 28 10:26:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 10:26:29 2010 -0700" }, "message": "am c89dd54c: Remove logging on wifilock acquire/release\n\nMerge commit \u0027c89dd54ceeec99173d51d1196e2c03a58f120211\u0027 into gingerbread-plus-aosp\n\n* commit \u0027c89dd54ceeec99173d51d1196e2c03a58f120211\u0027:\n Remove logging on wifilock acquire/release\n" }, { "commit": "c89dd54ceeec99173d51d1196e2c03a58f120211", "tree": "e783ef870248bbbea09cb40da8dc029258aba1b1", "parents": [ "a16682b5e8ed635910eada23272ba6548922c02e" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Tue Sep 28 08:40:54 2010 -0700" }, "committer": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Tue Sep 28 10:13:14 2010 -0700" }, "message": "Remove logging on wifilock acquire/release\n\nBug: 3042300\nChange-Id: Ia3ce184f53bdd9afee1c78bb9c294af57364f266\n" }, { "commit": "400f12b4dde36bc3e4c02e7f861bad33d1f42a17", "tree": "b94a8190646dc9f0b2f0a70f96540bfe49f867f8", "parents": [ "a57afb6a6c9f4fb451535c3d6f49c3bdf4b59125" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 13:01:49 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 13:01:49 2010 +0800" }, "message": "Fix build.\n\nChange-Id: Iae02fabe42013705592f75748388daf8fa5ed54e\n" }, { "commit": "a57afb6a6c9f4fb451535c3d6f49c3bdf4b59125", "tree": "f08d30ca074de4d1247bef04b806e6f14420b674", "parents": [ "747eb00eef784f7df746e61e7e714e4e422eb6d1", "2a36a778d384403cd92b1016ed5c860d3f2c3521" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 12:17:44 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 12:17:44 2010 +0800" }, "message": "resolved conflicts for merge of 2a36a778 to master\n\nChange-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3\n" }, { "commit": "b740491871fdb4782164406b850bc080978ee63c", "tree": "25130bdb7ebd8daab68bba54d35759445bbdbc07", "parents": [ "4d5a8b55873dc9818fa00c0daba214710421b794", "d0cb228b9af0b67fa3372ee075287e7409249550" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Sep 27 21:03:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 21:03:30 2010 -0700" }, "message": "am d0cb228b: am 23142acf: Merge \"squeeze a few more bits of randomness into /dev/random\" into gingerbread\n\nMerge commit \u0027d0cb228b9af0b67fa3372ee075287e7409249550\u0027\n\n* commit \u0027d0cb228b9af0b67fa3372ee075287e7409249550\u0027:\n squeeze a few more bits of randomness into /dev/random\n" }, { "commit": "cca1f0e3476edd09cdd81b075a6b7780a2959b46", "tree": "d403a9351ccb722771dea382852bde6df8f23a68", "parents": [ "c63806d852a550d82bbe6cadff8a2139d78ed559" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Sep 26 18:34:53 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 27 18:05:44 2010 -0700" }, "message": "Allow all apps to call ContentResolver.getType().\n\nI can\u0027t find the bug number for this, but it is needed for some things\nwe are doing where the app building an intent may not have access to the\nURI in the data field. This is for HC, but doing in GB to avoid introducing\nintegration issues.\n\nChange-Id: I0cac971854198b18775d2a73deb80f23431bfbe2\n" }, { "commit": "8c66580759b3085866e1f9f1ca9af1a60220e574", "tree": "af2b24843139400422d496671d293d0cb3d60bc6", "parents": [ "2a36a778d384403cd92b1016ed5c860d3f2c3521", "4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a" ], "author": { "name": "repo sync . build/envsetup.sh lunch passion-en", "email": "clchen@google.com", "time": "Mon Sep 27 17:51:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 17:51:45 2010 -0700" }, "message": "am 4fc3d2f0: DO NOT MERGE\n\nMerge commit \u00274fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a\u0027 into gingerbread-plus-aosp\n\n* commit \u00274fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a\u0027:\n DO NOT MERGE\n" }, { "commit": "4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a", "tree": "0e0527811066ffbed94cf3851c63a9d9ad2595d4", "parents": [ "68ef7f3c3a8deb0e14b0b6325876b23cecc191b3" ], "author": { "name": "repo sync . build/envsetup.sh lunch passion-eng", "email": "clchen@google.com", "time": "Mon Sep 27 17:39:50 2010 -0700" }, "committer": { "name": "repo sync . build/envsetup.sh lunch passion-eng", "email": "clchen@google.com", "time": "Mon Sep 27 17:46:07 2010 -0700" }, "message": "DO NOT MERGE\n\nThis is a manual cherrypick of:\nChange I3a76de15: Fixing font scale in WindowManagerService. There was\na bug that causes WindowManagerService to lose the fontScale setting.\n\nChange-Id: I9b993e11f6a3e75735d8ed05596083893543d732\n" }, { "commit": "2a36a778d384403cd92b1016ed5c860d3f2c3521", "tree": "e46cf861b3b921aba3913cb4158fba4d2744559c", "parents": [ "4e9243d55ce183542c74550e503ea583643599a0", "68ef7f3c3a8deb0e14b0b6325876b23cecc191b3" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 16:29:33 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 16:29:33 2010 -0700" }, "message": "am 68ef7f3c: Merge \"Move SipService out of SystemServer to phone process.\" into gingerbread\n\nMerge commit \u002768ef7f3c3a8deb0e14b0b6325876b23cecc191b3\u0027 into gingerbread-plus-aosp\n\n* commit \u002768ef7f3c3a8deb0e14b0b6325876b23cecc191b3\u0027:\n Move SipService out of SystemServer to phone process.\n" }, { "commit": "68ef7f3c3a8deb0e14b0b6325876b23cecc191b3", "tree": "994adc214fa6eb5e54909e3de5d242494334b8d5", "parents": [ "8d7057df401af668335c38273bc62872e4dbf538", "7e54ef71db3320a751571bba5259fba816399421" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 16:25:49 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 27 16:25:49 2010 -0700" }, "message": "Merge \"Move SipService out of SystemServer to phone process.\" into gingerbread" }, { "commit": "e65041225ec0bbc3d67a3b70cdc6d598a5760043", "tree": "8eb92db22f21de0a2843aa39b9988d15e00233d9", "parents": [ "464fb74e28b6d76d5e741abcdbb714eea2d9b4d1" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Sep 27 14:52:15 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Sep 27 16:10:17 2010 -0700" }, "message": "Add support for transferring touch focus.\n\nPrerequisite for drag and drop.\n\nChange-Id: Iedbe93ed0f3e1c4083130fe66b4ba06d416afce0\n" }, { "commit": "d0cb228b9af0b67fa3372ee075287e7409249550", "tree": "b018f4abcb6f81877c69d0cddc22bebbc0c98758", "parents": [ "55ee8f9329b4e99427dddc692e3d8ff10d9c9eef", "23142acffab69738b967812fdbdf7bbda18a44d8" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Sep 27 15:26:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 15:26:51 2010 -0700" }, "message": "am 23142acf: Merge \"squeeze a few more bits of randomness into /dev/random\" into gingerbread\n\nMerge commit \u002723142acffab69738b967812fdbdf7bbda18a44d8\u0027 into gingerbread-plus-aosp\n\n* commit \u002723142acffab69738b967812fdbdf7bbda18a44d8\u0027:\n squeeze a few more bits of randomness into /dev/random\n" }, { "commit": "23142acffab69738b967812fdbdf7bbda18a44d8", "tree": "0a9150293f6d2686369819734aa372729c4e0111", "parents": [ "44e8ff9924db43ee2470d868ce31b1c039c99b35", "b91ec410c8ecd09390e7122115e2ab6b7aafefb8" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Sep 27 15:23:45 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 27 15:23:45 2010 -0700" }, "message": "Merge \"squeeze a few more bits of randomness into /dev/random\" into gingerbread" }, { "commit": "b91ec410c8ecd09390e7122115e2ab6b7aafefb8", "tree": "40f34c0778d8356a6725996b8e7f32a6af81fa14", "parents": [ "194bbcce9ba15634500f542b9ea017b2cf154b45" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Sep 27 14:49:00 2010 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Sep 27 14:49:00 2010 -0700" }, "message": "squeeze a few more bits of randomness into /dev/random\n\nChange-Id: Ida30c33985411f353c828b43ea26ca1b7e6502af\n" }, { "commit": "7e54ef71db3320a751571bba5259fba816399421", "tree": "ac4c1a7d45c1406366e7f7ba02ec0b0d6117d386", "parents": [ "04a426f5b50a628fb73bc29b003b0e5bece17c27" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Sat Sep 25 22:49:59 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 05:19:35 2010 +0800" }, "message": "Move SipService out of SystemServer to phone process.\n\nCompanion CL: https://android-git/g/#change,70187\nhttp://b/issue?id\u003d2998069\n\nChange-Id: I90923ac522ef363a4e04292f652d413c5a1526ad\n" }, { "commit": "a8bce7c8acb3904eb69bf21276c0ca2635c76a20", "tree": "3687f29b2ed1e8eb9b74d995dff9de2bf7824b08", "parents": [ "9785bf0f2b6b8758aed7ded3b996a2ef0be89919", "d8691d73d158acd9ffc63748126e822afd656707" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 27 12:45:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 12:45:31 2010 -0700" }, "message": "am d8691d73: Merge \"Allow all apps to call ContentResolver.getType().\" into gingerbread\n\nMerge commit \u0027d8691d73d158acd9ffc63748126e822afd656707\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d8691d73d158acd9ffc63748126e822afd656707\u0027:\n Allow all apps to call ContentResolver.getType().\n" }, { "commit": "d8691d73d158acd9ffc63748126e822afd656707", "tree": "41c330928c6672392c6cb870289ed9e42028128e", "parents": [ "14a288da6a372230d9af41da12241fe500eec837", "8313fc7e94e46e5cc09f457a15a771a325b9f74f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 27 12:42:34 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 27 12:42:34 2010 -0700" }, "message": "Merge \"Allow all apps to call ContentResolver.getType().\" into gingerbread" }, { "commit": "2079843412ef2e56c17cb5d96a31785938e97da5", "tree": "2307772569d8f2128cd67eb75dca739b7165a9cc", "parents": [ "5a474a2bb8bc23fcc8d05e8b9ec3f4306dd63db1", "45a83a896701f61f72082f7116b85d1537ebf4cb" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:57:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:57:08 2010 -0700" }, "message": "am 45a83a89: am fccd5bc7: Fix build.\n\nMerge commit \u002745a83a896701f61f72082f7116b85d1537ebf4cb\u0027\n\n* commit \u002745a83a896701f61f72082f7116b85d1537ebf4cb\u0027:\n Fix build.\n" }, { "commit": "45a83a896701f61f72082f7116b85d1537ebf4cb", "tree": "ee3fc8ec828b89a354a2e97ae3e21c7c7e752e1a", "parents": [ "44669d31d1d5b094d7b7d3e393281440ea0c9536", "fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:52:35 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:52:35 2010 -0700" }, "message": "am fccd5bc7: Fix build.\n\nMerge commit \u0027fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f\u0027 into gingerbread-plus-aosp\n\n* commit \u0027fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f\u0027:\n Fix build.\n" }, { "commit": "6cf8f64be3c079ef76d708a56b55a2b7ca6dbd2f", "tree": "40a63d05fe88dc6e6442c60edeb22975fcf3cae7", "parents": [ "031d8786824a385fa47750e5e8aa75f40d70cae9", "c5027642ff3909911d27e4abaa5e3abf1615b38d" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:47:37 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:47:37 2010 -0700" }, "message": "am c5027642: am 025a39af: SIP: misc fixes\n\nMerge commit \u0027c5027642ff3909911d27e4abaa5e3abf1615b38d\u0027\n\n* commit \u0027c5027642ff3909911d27e4abaa5e3abf1615b38d\u0027:\n SIP: misc fixes\n" }, { "commit": "031d8786824a385fa47750e5e8aa75f40d70cae9", "tree": "a9f52087b62eb2b194502b82447b5bc6d2e94fbb", "parents": [ "2b0fa71c1a9e588fc31944baa5a21c362a0ab1ca", "fe2d279c5ef571340f20d433badd9f68072299af" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:47:32 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:47:32 2010 -0700" }, "message": "am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error\n\nMerge commit \u0027fe2d279c5ef571340f20d433badd9f68072299af\u0027\n\n* commit \u0027fe2d279c5ef571340f20d433badd9f68072299af\u0027:\n SipService: handle cross-domain authentication error\n" }, { "commit": "c5027642ff3909911d27e4abaa5e3abf1615b38d", "tree": "1d49c6875b5146f026834cb995a0133d6076668d", "parents": [ "fe2d279c5ef571340f20d433badd9f68072299af", "025a39af346f39743c1e384b9000ce1baee36562" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:20:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:20:30 2010 -0700" }, "message": "am 025a39af: SIP: misc fixes\n\nMerge commit \u0027025a39af346f39743c1e384b9000ce1baee36562\u0027 into gingerbread-plus-aosp\n\n* commit \u0027025a39af346f39743c1e384b9000ce1baee36562\u0027:\n SIP: misc fixes\n" }, { "commit": "fe2d279c5ef571340f20d433badd9f68072299af", "tree": "e3835837ff38012748401290a495a0863b28119a", "parents": [ "c6581a1046b062d0e06e50e9b09e6c12a8e54efc", "00a22064efef4f574e439079aae2deae1a087a31" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:20:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:20:24 2010 -0700" }, "message": "am 00a22064: SipService: handle cross-domain authentication error\n\nMerge commit \u002700a22064efef4f574e439079aae2deae1a087a31\u0027 into gingerbread-plus-aosp\n\n* commit \u002700a22064efef4f574e439079aae2deae1a087a31\u0027:\n SipService: handle cross-domain authentication error\n" }, { "commit": "fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f", "tree": "45a5a3c1e1c844d58d63520b7ef1c3941d9ebed6", "parents": [ "fd144d7667d9d050b7fb158276ae4623d4ea83b8" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 02:16:32 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 02:16:32 2010 +0800" }, "message": "Fix build.\n\nChange-Id: Ie47b63f02764e8a1ca1d36f502b6b4134859ff0d\n" }, { "commit": "025a39af346f39743c1e384b9000ce1baee36562", "tree": "159ecd150d8ff4343ffb079eb400728aaba67c9c", "parents": [ "00a22064efef4f574e439079aae2deae1a087a31" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 23 11:35:05 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 01:52:42 2010 +0800" }, "message": "SIP: misc fixes\n\n+ check REQUEST_TERMINATED response on INVITE not CANCEL,\n+ check if a TransactionTerminatedEvent matches the ongoing transaction,\n+ add log to track SipConnection disconnect events.\n\nChange-Id: I28325be62ac44e4a7507d3c4b5b78b066c0ea2ad\n" }, { "commit": "00a22064efef4f574e439079aae2deae1a087a31", "tree": "13083f04f2bccaf3475b7f959c9d2d17d9775734", "parents": [ "4e9751f0770c8bfe6f7d57465cba754af5aa942b" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Sat Sep 25 23:21:23 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 10:45:24 2010 -0700" }, "message": "SipService: handle cross-domain authentication error\n\nand add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK\nDisconnectCause.\n\nhttp://b/issue?id\u003d3020185\n\nChange-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978\n" }, { "commit": "831f898756daef932ec2502d3965d4184217e726", "tree": "29720a9369e9cc94e5369fe18ba77ffe52a86135", "parents": [ "e6147f0c4bf8f6f1acf77831673cf5fe8fdd02c3", "8f767774230cba9b5cfc298f2e24972a79cd0182" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Sep 27 08:28:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 08:28:07 2010 -0700" }, "message": "am 8f767774: am 465618ed: Merge \"Use buffered output during packages.xml write\" into gingerbread\n\nMerge commit \u00278f767774230cba9b5cfc298f2e24972a79cd0182\u0027\n\n* commit \u00278f767774230cba9b5cfc298f2e24972a79cd0182\u0027:\n Use buffered output during packages.xml write\n" }, { "commit": "8f767774230cba9b5cfc298f2e24972a79cd0182", "tree": "7b6de28b5fadd9e366cd1db009bcabac7316a7e1", "parents": [ "514a455f2a63d6b3366b848a585d99e8680f69aa", "465618ed567c418442890fcf91b6ee361b22b88b" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Sep 27 08:15:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 08:15:57 2010 -0700" }, "message": "am 465618ed: Merge \"Use buffered output during packages.xml write\" into gingerbread\n\nMerge commit \u0027465618ed567c418442890fcf91b6ee361b22b88b\u0027 into gingerbread-plus-aosp\n\n* commit \u0027465618ed567c418442890fcf91b6ee361b22b88b\u0027:\n Use buffered output during packages.xml write\n" }, { "commit": "8313fc7e94e46e5cc09f457a15a771a325b9f74f", "tree": "d68bf554b0d92a64cde72e58178e60d4d30b521d", "parents": [ "08c09b0f84b23627b4cd02e1b9a642952fbd2e7f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Sep 26 18:34:53 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Sep 26 21:31:47 2010 -0700" }, "message": "Allow all apps to call ContentResolver.getType().\n\nI can\u0027t find the bug number for this, but it is needed for some things\nwe are doing where the app building an intent may not have access to the\nURI in the data field. This is for HC, but doing in GB to avoid introducing\nintegration issues.\n\nChange-Id: I0cac971854198b18775d2a73deb80f23431bfbe2\n" }, { "commit": "9f306d78a4adae80989eecb411af454225ff55a9", "tree": "8cc6e5af4c5c03aafa6c8b455d224d8d95731392", "parents": [ "d45a33554ca6c18ed81e45320998b9e4f4680379" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Sun Sep 26 11:19:47 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Sun Sep 26 11:19:47 2010 -0700" }, "message": "Use buffered output during packages.xml write\n\nFileOutputStream writes data one byte at a time, so use the\nBufferedOutputStream to wrap it and write once all the XML serialization\nis done.\n\nChange-Id: I419a6fcac2ac9a72a6cf41d4ca6e7ab6c7505618\n" }, { "commit": "22ba86cfafaedab650a3bb85417ed4d9c0c57675", "tree": "c2f8597c091e5d5508be2f0bbc705c69fb2148cb", "parents": [ "e9d51c4e887ed92698b308dbe9f6afb9a911de82", "ca25d2c31dc20f69597be8f34d6da9167d53b4d0" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Sep 24 16:14:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 16:14:08 2010 -0700" }, "message": "am ca25d2c3: am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.\n\nMerge commit \u0027ca25d2c31dc20f69597be8f34d6da9167d53b4d0\u0027\n\n* commit \u0027ca25d2c31dc20f69597be8f34d6da9167d53b4d0\u0027:\n Fixed some timeout and lock reentrance issues with broadcasts.\n" }, { "commit": "ca25d2c31dc20f69597be8f34d6da9167d53b4d0", "tree": "82094be6d67ccadc5552202cc9ca784b70d860f7", "parents": [ "ffe477263c503ce75d609d5360cf5e0c72a1363f", "4d94a766c3f7cf32dd3f5d543048fa801ad22813" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Sep 24 16:07:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 16:07:24 2010 -0700" }, "message": "am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.\n\nMerge commit \u00274d94a766c3f7cf32dd3f5d543048fa801ad22813\u0027 into gingerbread-plus-aosp\n\n* commit \u00274d94a766c3f7cf32dd3f5d543048fa801ad22813\u0027:\n Fixed some timeout and lock reentrance issues with broadcasts.\n" }, { "commit": "4d94a766c3f7cf32dd3f5d543048fa801ad22813", "tree": "c3be1a7c71ee4a7969d079b6caaec5449b462284", "parents": [ "e78fc18b339bfe2915e61aef2013a17f0a9ede33" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Sep 23 11:33:28 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Sep 24 16:00:25 2010 -0700" }, "message": "Fixed some timeout and lock reentrance issues with broadcasts.\n\nWhen starting a broadcast, the ActivityManagerService posts a delayed\nBROADCAST_TIMEOUT_MSG to handle timeouts. If a premature timeout occurs,\nwe post a new BROADCAST_TIMEOUT_MSG to extend the timeout time for the\ncurrent receiver. However, if the current receiver does timeout, the\nmessage is consumed and no replacement is ever posted.\n\nTo fix the dropped timeouts, we track whether we have a pending broadcast\ntimeout message and setup a new one when we begin working on the next receiver.\n\nAs a last resort, performNextBroadcast contains code to detect whether\na broadcast appears to be hung (timeout handling failed). If so, it\ncalls broadcastTimeout to cause it to timeout immediately.\nHowever, performNextBroadcast is holding on to the ActivityManagerService\nlock while doing this but broadcastTimout expected to be called\nwhile the lock was not held since after updating the broadcast record state,\nit calls appNotResponding.\n\nTo fix the unintentended lock reentrance, changed broadcastTimeout to\nassume the lock is already held (and the callers ensure this) then\nadded code to perform the ANR asynchronously.\n\nRenamed a few methods to add \"Locked\" suffixes where appropriate and added\na few comments for tricky areas uncovered during review.\n\nChange-Id: I3cb5b06d6b6a4a338f32c0998db721f6acf3b082\n" }, { "commit": "405e012681aa563b1d7b66c671c90ed2deb26e41", "tree": "6687aa617fea8213148702c68e4da9083122eb0c", "parents": [ "3011b6617232d1ef7c1687d1db9e780fce978d30", "deaa8ff1b10d38add4f7c276e7be2ffc19359a14" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 15:58:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 15:58:25 2010 -0700" }, "message": "am deaa8ff1: am a7ef18fc: Merge \"Some debugging support.\" into gingerbread\n\nMerge commit \u0027deaa8ff1b10d38add4f7c276e7be2ffc19359a14\u0027\n\n* commit \u0027deaa8ff1b10d38add4f7c276e7be2ffc19359a14\u0027:\n Some debugging support.\n" }, { "commit": "3011b6617232d1ef7c1687d1db9e780fce978d30", "tree": "548e2f9a62ba24e5784175b4b947c0e75dc3fbef", "parents": [ "a7936a5d6d3c989055fffa74f6c5a4b4a8c83114", "d6d83279183db749de07bfdac79fe4180fc848d0" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 15:58:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 15:58:09 2010 -0700" }, "message": "am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for cancelling\n\nMerge commit \u0027d6d83279183db749de07bfdac79fe4180fc848d0\u0027\n\n* commit \u0027d6d83279183db749de07bfdac79fe4180fc848d0\u0027:\n SIP: longer timeout for making call, shorter for cancelling\n" }, { "commit": "deaa8ff1b10d38add4f7c276e7be2ffc19359a14", "tree": "711d6a68fb7f203e709d0407f15fcaa88d04ef49", "parents": [ "d6d83279183db749de07bfdac79fe4180fc848d0", "a7ef18fca50d0db99a161d8c7e2d8979f0445503" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 15:32:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 15:32:51 2010 -0700" }, "message": "am a7ef18fc: Merge \"Some debugging support.\" into gingerbread\n\nMerge commit \u0027a7ef18fca50d0db99a161d8c7e2d8979f0445503\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a7ef18fca50d0db99a161d8c7e2d8979f0445503\u0027:\n Some debugging support.\n" }, { "commit": "a7ef18fca50d0db99a161d8c7e2d8979f0445503", "tree": "32d3ee6fd26528d8c55e50144b17ae16be5fe6b5", "parents": [ "194bbcce9ba15634500f542b9ea017b2cf154b45", "f123e49bf0708719b51a7064ae134c097abe4a54" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 15:28:34 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 24 15:28:34 2010 -0700" }, "message": "Merge \"Some debugging support.\" into gingerbread" }, { "commit": "d6d83279183db749de07bfdac79fe4180fc848d0", "tree": "2cbc5865af610175b59ba3c6a9b2ef4cc3f63a17", "parents": [ "f3ae63eef2d7f55c793b2e76d1371f82cea0aab7", "194bbcce9ba15634500f542b9ea017b2cf154b45" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 15:19:05 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 15:19:05 2010 -0700" }, "message": "am 194bbcce: SIP: longer timeout for making call, shorter for cancelling\n\nMerge commit \u0027194bbcce9ba15634500f542b9ea017b2cf154b45\u0027 into gingerbread-plus-aosp\n\n* commit \u0027194bbcce9ba15634500f542b9ea017b2cf154b45\u0027:\n SIP: longer timeout for making call, shorter for cancelling\n" }, { "commit": "194bbcce9ba15634500f542b9ea017b2cf154b45", "tree": "d91fc2516d703c6d2b41178ae7e12d143128b0ac", "parents": [ "52f58e96a723a56e6619c237c814a07503745de9" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 03:01:25 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Sat Sep 25 06:09:00 2010 +0800" }, "message": "SIP: longer timeout for making call, shorter for cancelling\n\nhttp://b/3021865\n\nChange-Id: I354ebcc00f1ac68e4b7b466745c36aeb314f9138\n" }, { "commit": "f333123d50776507891b90a6eda4a3b8fa305bb6", "tree": "32f36bd788a96e89aa362f8252cbfbfb9e08cdfb", "parents": [ "369b43a935d08f1d9991a80a5859c65c394e9a02", "2d457a32a653ad06487cf0fef9ef400f3055099a" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Sep 24 14:32:21 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Sep 24 14:47:06 2010 -0700" }, "message": "resolved conflicts for merge of 2d457a32 to master\n\nChange-Id: I08fc7881010083407a102f471483cd6d5b9774b4\n" }, { "commit": "f123e49bf0708719b51a7064ae134c097abe4a54", "tree": "73c218afbbede522ca5c7d70b1399cf55609ca5d", "parents": [ "6d8fae722cfb2833dd542b2a5e613582a9096fc6" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 11:16:23 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 13:11:55 2010 -0700" }, "message": "Some debugging support.\n\n- New feature to \"am monitor\" to have it automatically launch\n gdbserv for you when a crash/ANR happens, and tell you how to\n run the client.\n\n- Update dumpstate to match new location of binder debug logs\n\n- Various commented out logs that are being used to track down\n issues.\n\nChange-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5\n" }, { "commit": "2d457a32a653ad06487cf0fef9ef400f3055099a", "tree": "ddc2f5743ce0fa4bcf576eb3038167862fdd02b7", "parents": [ "f2af2d924df3d444c9a1bcac9f30e0d05ea5086d", "8f97fe551e7bd95abf395eed303b975eaa8f0158" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Sep 24 11:09:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 11:09:29 2010 -0700" }, "message": "am 8f97fe55: Merge \"Move long Connectivity tasks to handler thread.\" into gingerbread\n\nMerge commit \u00278f97fe551e7bd95abf395eed303b975eaa8f0158\u0027 into gingerbread-plus-aosp\n\n* commit \u00278f97fe551e7bd95abf395eed303b975eaa8f0158\u0027:\n Move long Connectivity tasks to handler thread.\n" }, { "commit": "8f97fe551e7bd95abf395eed303b975eaa8f0158", "tree": "c2e51b493755d421221a375e509f14bc659317f5", "parents": [ "4318ab058629b701e225bb7ead9dd2b229c9354b", "8dcc28be065bb5997ed97d58c9592324b891023a" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Sep 24 10:42:46 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 24 10:42:46 2010 -0700" }, "message": "Merge \"Move long Connectivity tasks to handler thread.\" into gingerbread" }, { "commit": "50d9f32506d1cf3f8b21caa1f34780db6b80abd5", "tree": "ff4740715e7a8ce1b5c7a926b981550f796be127", "parents": [ "22a62d1342a973ed7d38bb7d1751a472365e2897", "33460d836fc2a062290d72ebcfb73af51ffa9c36" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Sep 23 22:50:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 22:50:10 2010 -0700" }, "message": "am 33460d83: am 658bec95: SDP: remove dead code.\n\nMerge commit \u002733460d836fc2a062290d72ebcfb73af51ffa9c36\u0027\n\n* commit \u002733460d836fc2a062290d72ebcfb73af51ffa9c36\u0027:\n SDP: remove dead code.\n" }, { "commit": "22a62d1342a973ed7d38bb7d1751a472365e2897", "tree": "f9033e819ded5b8e7f5eed79a68848fd1d8b835c", "parents": [ "2184624db15088bcd230d1e8da1ad7d9bca91c90", "ee813baee49c94f87916d6a179bd5d16837e228a" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 13:45:43 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 13:45:43 2010 +0800" }, "message": "resolved conflicts for merge of ee813bae to master\n\nChange-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68\n" }, { "commit": "77cf6f29f97f9ef6213a0a9b8b6ec2215fff20ff", "tree": "d1ba109d5715de471708206af10928c2678a6aa4", "parents": [ "01a411326e8d3370643ca181966ae3214ea700fd", "982c07e908c4cb66db224ccfd0810bf8bd449835" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 23 21:40:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 21:40:24 2010 -0700" }, "message": "am 982c07e9: am cbb7b05e: Merge \"Crash apps when they provide bad notifications instead of crashing the system process.\" into gingerbread\n\nMerge commit \u0027982c07e908c4cb66db224ccfd0810bf8bd449835\u0027\n\n* commit \u0027982c07e908c4cb66db224ccfd0810bf8bd449835\u0027:\n Crash apps when they provide bad notifications instead of crashing the system process.\n" }, { "commit": "01a411326e8d3370643ca181966ae3214ea700fd", "tree": "c4df49b8c36077bcf93763f67015c9b03d0f6113", "parents": [ "0eb74130ac1fa7e5dd1c943c5a0a119053f23408", "1e2df14a85f098d63b618531db733a21429d4037" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Sep 23 21:39:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 21:39:49 2010 -0700" }, "message": "am 1e2df14a: am f43ac911: Merge \"Handle OPTIONS requests from SIP servers.\" into gingerbread\n\nMerge commit \u00271e2df14a85f098d63b618531db733a21429d4037\u0027\n\n* commit \u00271e2df14a85f098d63b618531db733a21429d4037\u0027:\n Handle OPTIONS requests from SIP servers.\n" }, { "commit": "846df9f5171c4ef32f038cca651b6b9c0b6c3083", "tree": "e14bba46d6af691a2832907f6b3f64caac3c736c", "parents": [ "fea28c9367c9d1a48ae56c554dd51a428f2d1b03", "8952a4488e81205e3013b6b456dec503e05eebd0" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 19:08:08 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 20:33:19 2010 -0700" }, "message": "resolved conflicts for merge of 8952a448 to master\n\nChange-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b\n" }, { "commit": "33460d836fc2a062290d72ebcfb73af51ffa9c36", "tree": "2db05ebf2b0af132c8af7a89691f2589ac32be2e", "parents": [ "ee813baee49c94f87916d6a179bd5d16837e228a", "658bec956785e074edc4f6c9fe739c366e37be33" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Sep 23 19:22:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 19:22:12 2010 -0700" }, "message": "am 658bec95: SDP: remove dead code.\n\nMerge commit \u0027658bec956785e074edc4f6c9fe739c366e37be33\u0027 into gingerbread-plus-aosp\n\n* commit \u0027658bec956785e074edc4f6c9fe739c366e37be33\u0027:\n SDP: remove dead code.\n" }, { "commit": "658bec956785e074edc4f6c9fe739c366e37be33", "tree": "744b92adc28b04e5429b6856d6bfb749b3e09fbe", "parents": [ "84a357bb6a8005e1c5e924e96a8ecf310e77c47c" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Sep 23 17:11:02 2010 +0800" }, "committer": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Fri Sep 24 10:17:42 2010 +0800" }, "message": "SDP: remove dead code.\n\nChange-Id: I2a5764a2b9cabc54b0ac18666e494c1cb39c4e9b\n" }, { "commit": "ee813baee49c94f87916d6a179bd5d16837e228a", "tree": "3ec87c6b2ae82d2598d85b468990ab010ba63f92", "parents": [ "4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e", "84a357bb6a8005e1c5e924e96a8ecf310e77c47c" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 23 19:10:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 19:10:49 2010 -0700" }, "message": "am 84a357bb: Refactoring SIP classes to get ready for API review.\n\nMerge commit \u002784a357bb6a8005e1c5e924e96a8ecf310e77c47c\u0027 into gingerbread-plus-aosp\n\n* commit \u002784a357bb6a8005e1c5e924e96a8ecf310e77c47c\u0027:\n Refactoring SIP classes to get ready for API review.\n" }, { "commit": "84a357bb6a8005e1c5e924e96a8ecf310e77c47c", "tree": "7562523105a05d9ac3ca03b333c1aa70e08a3b7b", "parents": [ "524a6d8e9bb4df9cec0520ac1d9733642b13e76f" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 16 04:11:32 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 10:06:59 2010 +0800" }, "message": "Refactoring SIP classes to get ready for API review.\n\n+ replace SipAudioCall and its Listener interfaces with real implementations,\n + remove SipAudioCallImpl.java, most of it is has become part of SipAudioCall,\n+ add SipSession and its Listener classes to wrap ISipSession and ISipSessionListener,\n+ move SipSessionState to SipSession.State,\n+ make SipManager keep context and remove the context argument from many methods of its,\n+ rename SipManager.getInstance() to newInstance(),\n+ rename constant names for action strings and extra keys to follow conventions,\n+ set thread names for debugging purpose.\n\nChange-Id: Ie1790dc0e8f49c06c7fc80d33fec0f673a9c3044\n" }, { "commit": "982c07e908c4cb66db224ccfd0810bf8bd449835", "tree": "77dca2699bb14a30155083611f77430f558011b3", "parents": [ "1e2df14a85f098d63b618531db733a21429d4037", "cbb7b05e35368b104c27089f5f16640680f567c2" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 23 16:55:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 16:55:22 2010 -0700" }, "message": "am cbb7b05e: Merge \"Crash apps when they provide bad notifications instead of crashing the system process.\" into gingerbread\n\nMerge commit \u0027cbb7b05e35368b104c27089f5f16640680f567c2\u0027 into gingerbread-plus-aosp\n\n* commit \u0027cbb7b05e35368b104c27089f5f16640680f567c2\u0027:\n Crash apps when they provide bad notifications instead of crashing the system process.\n" }, { "commit": "cbb7b05e35368b104c27089f5f16640680f567c2", "tree": "8db251a8b7e45f5616d8c47fa5fadcad9d7c2f3e", "parents": [ "f43ac911379c15b6a1a240a931b0f3cbfb2fae53", "eaa0718780a29df8fbe42c59beecee5557fdf785" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 23 16:52:28 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 23 16:52:28 2010 -0700" }, "message": "Merge \"Crash apps when they provide bad notifications instead of crashing the system process.\" into gingerbread" }, { "commit": "eaa0718780a29df8fbe42c59beecee5557fdf785", "tree": "b4caca99201bbcff4799c0f1a542ab926de5fc11", "parents": [ "f9ec03c0f5fc2c6eba5bbead24c4eb314c0205be" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 23 16:49:20 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 23 16:49:20 2010 -0700" }, "message": "Crash apps when they provide bad notifications instead of crashing the system process.\n\nBug: 2958415\nChange-Id: I9cbef340fb20a64eca8493950b814399c26ce197\n" }, { "commit": "8dcc28be065bb5997ed97d58c9592324b891023a", "tree": "47debb7da669c8c41cfd24841533041c162d6a4a", "parents": [ "49a8bbf4eacbf0bde71bab05be0ab40488df109c" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 23 10:05:56 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 23 16:43:21 2010 -0700" }, "message": "Move long Connectivity tasks to handler thread.\n\nReduce ANR potential.\nbug:2942829\n\nChange-Id: I21610b462d5ab91821015cd16eecd86d2c0580d1\n" }, { "commit": "1e2df14a85f098d63b618531db733a21429d4037", "tree": "406d6784efea98a53f1ff0b5e3cebd5b2b601631", "parents": [ "8952a4488e81205e3013b6b456dec503e05eebd0", "f43ac911379c15b6a1a240a931b0f3cbfb2fae53" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Sep 23 16:40:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 16:40:09 2010 -0700" }, "message": "am f43ac911: Merge \"Handle OPTIONS requests from SIP servers.\" into gingerbread\n\nMerge commit \u0027f43ac911379c15b6a1a240a931b0f3cbfb2fae53\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f43ac911379c15b6a1a240a931b0f3cbfb2fae53\u0027:\n Handle OPTIONS requests from SIP servers.\n" }, { "commit": "f43ac911379c15b6a1a240a931b0f3cbfb2fae53", "tree": "9928ffea9030f04b27e1a67258d9973309a0057d", "parents": [ "287952c35e148811c106bc0f5036eabf20f71562", "0b4d2fb11405e2e785ec30cabe7bb311c654c0d2" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Sep 23 16:36:18 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 23 16:36:18 2010 -0700" }, "message": "Merge \"Handle OPTIONS requests from SIP servers.\" into gingerbread" }, { "commit": "8952a4488e81205e3013b6b456dec503e05eebd0", "tree": "44370605866624d20b30ff4a167869ce9fa296cd", "parents": [ "00cb6417dcaea2b1d02f47b3afb60c435712161b", "287952c35e148811c106bc0f5036eabf20f71562" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 16:04:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 16:04:23 2010 -0700" }, "message": "am 287952c3: Fix issue #3022508: Crash during media scan\n\nMerge commit \u0027287952c35e148811c106bc0f5036eabf20f71562\u0027 into gingerbread-plus-aosp\n\n* commit \u0027287952c35e148811c106bc0f5036eabf20f71562\u0027:\n Fix issue #3022508: Crash during media scan\n" }, { "commit": "287952c35e148811c106bc0f5036eabf20f71562", "tree": "baf7ae1e8a086c6e14138536caa925b2a793ce69", "parents": [ "f9ec03c0f5fc2c6eba5bbead24c4eb314c0205be" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 22 22:34:31 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 15:59:28 2010 -0700" }, "message": "Fix issue #3022508: Crash during media scan\n\nDon\u0027t kill processes for excessive wake lock use, even if they\nare in the background, as long as they have running services.\n\nAlso fix some problems with this, such as not noting the kill\nin battery stats.\n\nAnd add killing of processes for cpu usage as well, along with\nsome optimizations to computing CPU usage.\n\nAnd fix BatteryWaster to be better behaving for testing these\ncases.\n\nAdd new \"monitor\" command to am to watch as the activity manager\ndoes stuff (so we can catch things at the point of ANR).\n\nFinally some miscellaneous debug output for the stuff here, as\nwell as in progress debugging of an ANR.\n\nChange-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1\n" }, { "commit": "eecb5b9873bf2c2e61929a35c2762f03dd2bfeb0", "tree": "b35beb1798596e811b443eabc7410ee5ed179448", "parents": [ "6f27ab8bd4aca5a43f6bf93cd68c43dde825bfa1", "2983e038d189a257f1e5abb9c120bd1feb253773" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 14:20:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 14:20:48 2010 -0700" }, "message": "am 2983e038: am 045398e6: Merge \"Fix a deadlock I ran into.\" into gingerbread\n\nMerge commit \u00272983e038d189a257f1e5abb9c120bd1feb253773\u0027\n\n* commit \u00272983e038d189a257f1e5abb9c120bd1feb253773\u0027:\n Fix a deadlock I ran into.\n" }, { "commit": "2983e038d189a257f1e5abb9c120bd1feb253773", "tree": "28f3aa4fd25201f07bdb9993777f47dafe2e0de6", "parents": [ "9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7", "045398e6243fa4e83fb6435df4e8ffc6a7487a70" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 14:17:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 14:17:54 2010 -0700" }, "message": "am 045398e6: Merge \"Fix a deadlock I ran into.\" into gingerbread\n\nMerge commit \u0027045398e6243fa4e83fb6435df4e8ffc6a7487a70\u0027 into gingerbread-plus-aosp\n\n* commit \u0027045398e6243fa4e83fb6435df4e8ffc6a7487a70\u0027:\n Fix a deadlock I ran into.\n" }, { "commit": "045398e6243fa4e83fb6435df4e8ffc6a7487a70", "tree": "350f47f38b2d20d8ae288ea7303e17116ff89a86", "parents": [ "37cedce14bc0e68e8bf27c2cecb181728226e6ed", "0674069aa4fb75064d4617466cb625699c44e04d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 14:15:45 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 23 14:15:45 2010 -0700" }, "message": "Merge \"Fix a deadlock I ran into.\" into gingerbread" }, { "commit": "c6c9a7df582f68a924238592573a45674d3fd0ce", "tree": "3a1dc7283627fae63d32fc35ac833a9628f4bf18", "parents": [ "9b7ff13bfbe9a4e95184418f99379ec61d8b8e5f", "5ee89800bee7c6c755778795a536e0e2f12b85ff" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu Sep 23 11:33:49 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 23 11:33:49 2010 -0700" }, "message": "Merge \"Add Wifi Protected Setup support\"" }, { "commit": "0b4d2fb11405e2e785ec30cabe7bb311c654c0d2", "tree": "ee8de4fcee755068a9c3ead8f424b3a22454c996", "parents": [ "0b7d6de1559a4a78af76ab501e0a15afc396c2b9" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Sep 23 23:27:00 2010 +0800" }, "committer": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Fri Sep 24 00:53:10 2010 +0800" }, "message": "Handle OPTIONS requests from SIP servers.\n\nChange-Id: I849d5ea4c4c56a06d25ccdc6b959274c59c47200\n" }, { "commit": "35dcaece115e2f8e227c2e579d38c42b65ead85e", "tree": "f82fc685865c90dd152858db15b5e08c4c0ba18a", "parents": [ "27a835f8d8faf962d978cf7e1e3b562fa0715d60", "9c38a6dc13ba55fccb9c66f347307a1b4ae68105" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 23 09:40:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 09:40:20 2010 -0700" }, "message": "am 9c38a6dc: am e87ebb08: Merge \"Cleanup Netd to prevent getting hung.\" into gingerbread\n\nMerge commit \u00279c38a6dc13ba55fccb9c66f347307a1b4ae68105\u0027\n\n* commit \u00279c38a6dc13ba55fccb9c66f347307a1b4ae68105\u0027:\n Cleanup Netd to prevent getting hung.\n" }, { "commit": "5ee89800bee7c6c755778795a536e0e2f12b85ff", "tree": "383d40f410fe859f218456e8aa006dd090fadc0b", "parents": [ "e59c69dc3b1f2fa206aa22698c4aa31498438a5e" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu Sep 16 17:53:34 2010 -0700" }, "committer": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu Sep 23 09:13:34 2010 -0700" }, "message": "Add Wifi Protected Setup support\n\nAdd WPS PBC and WPS pin method support with pin obtained\nfrom AP\n\nBug: 2277571\n\nChange-Id: I6ff8e447ab8c5e59456a55152588fd4d6386c610\n" }, { "commit": "9c38a6dc13ba55fccb9c66f347307a1b4ae68105", "tree": "65d8a779716c89a9520dae82a5c43e6a95d8f2de", "parents": [ "c0f2d9522ea5891352e219c4ca8f85ac59287604", "e87ebb08fba88628a65eae88fc5bc7911cfa7d97" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 23 08:48:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 08:48:14 2010 -0700" }, "message": "am e87ebb08: Merge \"Cleanup Netd to prevent getting hung.\" into gingerbread\n\nMerge commit \u0027e87ebb08fba88628a65eae88fc5bc7911cfa7d97\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e87ebb08fba88628a65eae88fc5bc7911cfa7d97\u0027:\n Cleanup Netd to prevent getting hung.\n" }, { "commit": "e87ebb08fba88628a65eae88fc5bc7911cfa7d97", "tree": "d4a26347541897b6c0477afebadcbe7649549c71", "parents": [ "0b7d6de1559a4a78af76ab501e0a15afc396c2b9", "e5c3afb29241fd3faae309f973645d7f6a7ed111" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 23 08:41:21 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 23 08:41:21 2010 -0700" }, "message": "Merge \"Cleanup Netd to prevent getting hung.\" into gingerbread" }, { "commit": "ab751aa085433e9f735d2e7603459c6c7e9d2fb0", "tree": "ad5d37b0f1cad3297adef5b93d43e52c4a5b9381", "parents": [ "6b762aaa8d24e9dcd91c69eaced417f688894add" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Tue Sep 14 19:17:36 2010 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Thu Sep 23 16:25:07 2010 +0900" }, "message": "Add methods for managing subtypes\n\n- added showInputMethodSubtypePicker to public API\n-- show the selector dialog for subtypes\n- added getter, setter and event handler to InputMethodManagerService\n- extract InputMethodSubtype to the top level class for using it in aidl\n- TODO: make an enabler for input method subtypes\n- TODO: handle the event of changing an input method subtype in LatinIME\n\nChange-Id: I49f8c6675ac4b06511635d14a37bd398738eff33\n" }, { "commit": "0674069aa4fb75064d4617466cb625699c44e04d", "tree": "fa2dcbc2ffe585c4b3c88706461b43fbe447fe99", "parents": [ "dd62a056b8d746c620218a68bb476382f02d8174" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 22 22:46:21 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 22 22:46:21 2010 -0700" }, "message": "Fix a deadlock I ran into.\n\nActivity manager was calling into the backup service (and other\nthings) with its lock held.\n\nChange-Id: Id55093e09cc5fe81b73b85968184816d956e0ae8\n" } ], "next": "40d073cf87b6339810d5e66f2ce9dd0f3af57ef1" }