)]}' { "log": [ { "commit": "c751e37c4fea4aecb7cc8859d8ac9a6e2a8ce93f", "tree": "492d6b1454c5f1a904e62851ba6a00a180d85ec3", "parents": [ "80059d6c1b60e9920b7ae133808c989b4d3fa8fe", "cc93507124855591be40af55a94deeb33d74e719" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jul 02 17:22:40 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 02 17:22:40 2012 -0700" }, "message": "am cc935071: Merge \"DO NOT MERGE Set force hiding differently\" into jb-dev\n\n* commit \u0027cc93507124855591be40af55a94deeb33d74e719\u0027:\n DO NOT MERGE Set force hiding differently\n" }, { "commit": "cc93507124855591be40af55a94deeb33d74e719", "tree": "a0e122542274f84b5657b83b08bf223ac18604b8", "parents": [ "00b9e899320488ff5623d8c80258ed7dfefc7b53", "503d6a44a8193d8111eba393651dcb522cc1cf87" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jul 02 17:20:00 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 02 17:20:00 2012 -0700" }, "message": "Merge \"DO NOT MERGE Set force hiding differently\" into jb-dev" }, { "commit": "80059d6c1b60e9920b7ae133808c989b4d3fa8fe", "tree": "9e62c3b7693fd63430f1ef8393b3dff03151c3bc", "parents": [ "e102b8168a9a54cd84c58904111986640286997f", "00b9e899320488ff5623d8c80258ed7dfefc7b53" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jul 02 17:05:16 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 02 17:05:16 2012 -0700" }, "message": "am 00b9e899: Merge \"Clear startingDisplayed flag when removing window.\" into jb-dev\n\n* commit \u002700b9e899320488ff5623d8c80258ed7dfefc7b53\u0027:\n Clear startingDisplayed flag when removing window.\n" }, { "commit": "38b2478f63004c493d7f7f1ac0bf07f51d6f0757", "tree": "2cc3737dba7d1379ef54c8e4247c365697ec9484", "parents": [ "73d90e797bf52b52372314477553b140818717c9" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jul 02 16:21:28 2012 -0700" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jul 02 16:21:28 2012 -0700" }, "message": "Clear startingDisplayed flag when removing window.\n\nThe flag indicating that the Starting window is displayed was not\nbeing cleared when the Starting window was removed. That caused the\ngoodToGo indication to falsely indicate that all windows were drawn\nwhen in fact the destination activity had not yet been drawn. This\ncaused the animation to begin when it was still black behind the old\nanimation.\n\nThis fixes bug 6764727.\n\nChange-Id: Iacef73b0335b9bde2cdc8d0b072034222cd728e8\n" }, { "commit": "503d6a44a8193d8111eba393651dcb522cc1cf87", "tree": "6318522389e2f7a0ead1d0866ff3951c038b78ad", "parents": [ "73d90e797bf52b52372314477553b140818717c9" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jun 25 11:13:24 2012 -0700" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jul 02 13:16:15 2012 -0700" }, "message": "DO NOT MERGE Set force hiding differently\n\nOnly force hide windows when the keyguard is animating in.\n\nFixes bug 6721572.\n\nChange-Id: Iad7b8b811bcf0840726cbf6c6f279dabd08a3aba\n\nConflicts:\n\n\tservices/java/com/android/server/wm/WindowAnimator.java\n" }, { "commit": "095c58b73ac112cc7e00771430765434893d8bc5", "tree": "43c6ccb97dffe45ea697a1d9ad2eb70403b478db", "parents": [ "f632562f7d2e94978d185d192a62eb73925a59a2" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Tue May 29 12:40:46 2012 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 02 10:57:11 2012 -0700" }, "message": "Enhance StateMachine Quitting and logging support. DO NOT MERGE\n\nMake StateMachine#quit non-conditional and remove the need to\nprocess the SM_QUIT_CMD it is now private.\n\nRename halting to onHalting.\n\nAdd onQuitting\n\nChange the message specific logging to be more generic and change\nthe xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add\naddLogRec(String) and addLogRec(String, State) as the generic logging\nmethods.\n\nbug: 5678189\nChange-Id: I22f66d11828bfd70498db625fe1be728b90478b7\n\nConflicts:\n\n\tservices/java/com/android/server/NsdService.java\n" }, { "commit": "a9c3846194b69f1bfa73066be670c9d77f6dd0d7", "tree": "a25e667b48ddb6b91f07c901ae403957cbb95025", "parents": [ "b69c77cd194ccbe24a8b1e5d8457b44d150f9a96", "bfb752f8f0e4d73dc251c19d2ef79649fbbe4fd1" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 29 15:43:37 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 29 15:43:37 2012 -0700" }, "message": "am bfb752f8: Merge \"Fix issue #6761130: Clearing app data in settings does not clear app\\\u0027s USB storage\" into jb-dev\n\n* commit \u0027bfb752f8f0e4d73dc251c19d2ef79649fbbe4fd1\u0027:\n Fix issue #6761130: Clearing app data in settings does not clear app\u0027s USB storage\n" }, { "commit": "183ce028f10442dd6ada59de8fa531d690134663", "tree": "bb826af501467e58f564c7bf0675fa4868aba77d", "parents": [ "074b54fbc0b6254c0ba308e0cf2e86c1cc929348" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 29 15:00:21 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 29 15:00:21 2012 -0700" }, "message": "Fix issue #6761130: Clearing app data in settings does not clear app\u0027s USB storage\n\nThe package manager calls to clear data / clear cache were not also\nhaving default container service clear the data on external storage. Now\nthey do.\n\nChange-Id: Ib5e5eb6adf2cac5a4cc094cc1a02ac8cfb6a2edf\n" }, { "commit": "c7b2778c2dc7934665c56067b65d83d76fbe31e5", "tree": "63974c8e37700894b8df98c36c60be91f8ac9083", "parents": [ "9454e29896e22268416082c99931d13a37b7c71e", "cfb0f40903cf2180ce0947cdd965e2f5b90b48bb" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 28 15:36:40 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 28 15:36:40 2012 -0700" }, "message": "am cfb0f409: Merge \"Fix issue #6745498: Cannot view consecutive event details from agenda view\" into jb-dev\n\n* commit \u0027cfb0f40903cf2180ce0947cdd965e2f5b90b48bb\u0027:\n Fix issue #6745498: Cannot view consecutive event details from agenda view\n" }, { "commit": "cfb0f40903cf2180ce0947cdd965e2f5b90b48bb", "tree": "aa354cc9c8e9d2aaf99aaadcac40cbaeb93ea17b", "parents": [ "98fd6405aec16c6062f562bf6e7c5f2d50da5d60", "45a25bcfc9af74bc4275cc710347304e581f3c51" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 28 15:33:53 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 28 15:33:53 2012 -0700" }, "message": "Merge \"Fix issue #6745498: Cannot view consecutive event details from agenda view\" into jb-dev" }, { "commit": "45a25bcfc9af74bc4275cc710347304e581f3c51", "tree": "14a27ab34231d641eba57b9b6b4f4f1898770535", "parents": [ "9e608c12186d308fb1711e8824901fdf931a3a96" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 28 13:49:17 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 28 13:49:17 2012 -0700" }, "message": "Fix issue #6745498: Cannot view consecutive event details from agenda view\n\n- There was a long-standing bug when using FLAG_ACTIVITY_REORDER_TO_FRONT\nwhere we could find and use an activity that is currently finishing.\n- There was a recently introduced bug where activities being destroyed\nwould not be removed from the history stack at the time they are done\nbeing destroyed, allowing the above bug to be exposed.\n- Removing a task would not kill any processes associated with the app\nthat had a different name from the app itself.\n\nChange-Id: I4401ab6d348a69e1ac4fb8f719d2c69d5a78e567\n" }, { "commit": "2dca20e194778e6ce54709a484442df77f8d11be", "tree": "5be707aea87f37681e2010e6edcb47b0270bf55b", "parents": [ "a9ee110cd955a57ecec725f1357711876a418d2c", "4fa4648515c3c1f77a31da186a9fe31d6c509412" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Jun 28 10:00:04 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 28 10:00:04 2012 -0700" }, "message": "am 4fa46485: Merge \"Update dumpsys power output.\" into jb-dev\n\n* commit \u00274fa4648515c3c1f77a31da186a9fe31d6c509412\u0027:\n Update dumpsys power output.\n" }, { "commit": "4fa4648515c3c1f77a31da186a9fe31d6c509412", "tree": "8771d4ad52b2c1929ef23e28dbb0d6f6dae3e0fb", "parents": [ "8930458639527448429362255af96e94f5aba5ed", "672083b88aebc3f6fae978f2dafd15fdf4b9cd54" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Jun 28 09:56:47 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 28 09:56:47 2012 -0700" }, "message": "Merge \"Update dumpsys power output.\" into jb-dev" }, { "commit": "672083b88aebc3f6fae978f2dafd15fdf4b9cd54", "tree": "380a33ce41e78443bd5fbe8c3c3713fe121da4ac", "parents": [ "95cf8c1121a95750358ee99169c96d8d4dfb4950" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Jun 26 11:49:08 2012 -0700" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Jun 26 17:42:17 2012 -0700" }, "message": "Update dumpsys power output.\n\nA little more detail on the animation state. For aid in debugging\nb/6720247.\n\nChange-Id: Ibfabf7fc8822ccb74bb83e2fd8e53004691dcd76\n" }, { "commit": "2e8295ce1861d8284f16e0f0f80475db0ec2983f", "tree": "79f3ed84dc79daf2bddbf30543ac7c11ea2c7fac", "parents": [ "70585ac646998f4c6773b8c17c48210419bf676f", "3bb98aec9344af1299b90d1567b4443e4d50cc91" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 26 16:38:00 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 26 16:38:00 2012 -0700" }, "message": "am 3bb98aec: Merge \"Fix issue #6730064: When turning off Nakasi, it very often...\" into jb-dev\n\n* commit \u00273bb98aec9344af1299b90d1567b4443e4d50cc91\u0027:\n Fix issue #6730064: When turning off Nakasi, it very often...\n" }, { "commit": "3bb98aec9344af1299b90d1567b4443e4d50cc91", "tree": "0d8e2f3f0ab468733197b71e14b7c00022910acb", "parents": [ "eb2ab860259af98f0f640dc10f1c5fce7a17cbc1", "ea401541c51422ba76f8319927cca0f303c57a4e" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 26 16:36:36 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 26 16:36:36 2012 -0700" }, "message": "Merge \"Fix issue #6730064: When turning off Nakasi, it very often...\" into jb-dev" }, { "commit": "ea401541c51422ba76f8319927cca0f303c57a4e", "tree": "4d29da07d4882eb124b9f74a2d3e5f8a6f29d5f2", "parents": [ "9e608c12186d308fb1711e8824901fdf931a3a96" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 26 14:34:54 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 26 14:44:08 2012 -0700" }, "message": "Fix issue #6730064: When turning off Nakasi, it very often...\n\n...turns itself immediately back on.\n\nThe ON_AFTER_RELEASE flag is documented to not turn the screen on if\nit is currently off.\n\nUnfortunately, it didn\u0027t seem to actually do this -- it would just\ncause a userActivity() call, which turns on the screen if it is\ncurrently off.\n\nFix this by adding yet another boolean to that function to tell it\nto not poke user activity if the screen is off. (Yes the number of\nbooleans on it is now insane, and should be cleaned up after we\nget through JB.)\n\nBug: 6730064\nChange-Id: I850dfbc777c7668d08b7d63f42a293e22b878256\n" }, { "commit": "7d33d0c36c7e8c9de4139af383f7491823055bc7", "tree": "1ef20e96465e556be77d06b0fbc721da5a3797a4", "parents": [ "59bd7c2f4e5f1e2aedf9a8ca578561c13e4b6be3", "c17f92ce047e8d62fac829d1df5dae654f7e4de8" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Jun 26 10:36:54 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 26 10:36:54 2012 -0700" }, "message": "am c17f92ce: Merge \"Use removePackageLI instead of removing mPackages\" into jb-dev\n\n* commit \u0027c17f92ce047e8d62fac829d1df5dae654f7e4de8\u0027:\n Use removePackageLI instead of removing mPackages\n" }, { "commit": "c17f92ce047e8d62fac829d1df5dae654f7e4de8", "tree": "ca0d5409e33e79474afc48c6208b75bf184f5a97", "parents": [ "64b7a3e99526550aacd95f1dbd35487df7375ac6", "eca64b391408dfdb9ff3ae03fc39cfdb6918f3ad" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Jun 26 10:34:44 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 26 10:34:44 2012 -0700" }, "message": "Merge \"Use removePackageLI instead of removing mPackages\" into jb-dev" }, { "commit": "3346bc69493e75565208f9b485bd6038e6abefe9", "tree": "6504c4dc8fd645f7c876357f1fa078cf6905bd62", "parents": [ "e53fd84a28584692d9c99712a3d36100643ba000", "ab294eeb20d884855b038600f94a6e17b88b5772" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Jun 25 18:46:12 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 25 18:46:12 2012 -0700" }, "message": "am ab294eeb: Merge \"DevicePolicyManagerService: dump less\" into jb-dev\n\n* commit \u0027ab294eeb20d884855b038600f94a6e17b88b5772\u0027:\n DevicePolicyManagerService: dump less\n" }, { "commit": "ab294eeb20d884855b038600f94a6e17b88b5772", "tree": "1600437308e4895c0aac80195f7d8386d5a8ba82", "parents": [ "9e608c12186d308fb1711e8824901fdf931a3a96", "be00b410146b35b50fc213474a8d04d463021554" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Jun 25 18:43:56 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 25 18:43:56 2012 -0700" }, "message": "Merge \"DevicePolicyManagerService: dump less\" into jb-dev" }, { "commit": "be00b410146b35b50fc213474a8d04d463021554", "tree": "2f79d9a66aa26d2dc2ea8534c0447f60b9d843da", "parents": [ "e40c4636d970c50f7719e7d5067963be93c25750" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Jun 25 17:39:12 2012 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Jun 25 17:39:12 2012 -0700" }, "message": "DevicePolicyManagerService: dump less\n\nReduce the amount of unnecessary information emitted from\nthe DevicePolicyManagerService.\n\nBug: 6732364\nChange-Id: I639f6beab8471bdbe41ce6cd3a5a378acaf678b2\n" }, { "commit": "e53fd84a28584692d9c99712a3d36100643ba000", "tree": "51dbea070a3328acb3003eba647fb10eedebffd9", "parents": [ "9906e784faca2cc8388a04fdc544722ea93d51be", "9e608c12186d308fb1711e8824901fdf931a3a96" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 25 17:37:17 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 25 17:37:17 2012 -0700" }, "message": "am 9e608c12: Merge \"Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.\" into jb-dev\n\n* commit \u00279e608c12186d308fb1711e8824901fdf931a3a96\u0027:\n Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.\n" }, { "commit": "9906e784faca2cc8388a04fdc544722ea93d51be", "tree": "ed3523a5e647141e9c9f63fe1b7aa24882437efb", "parents": [ "b4215267f342759c8bdad02ed124dae4bb6d6833", "17990395bc62f8ce1bae4f1880899f231a8e613b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 25 17:37:15 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 25 17:37:15 2012 -0700" }, "message": "am 17990395: Merge \"Fix issue #6717667: expanded notification actions don\\\u0027t work on the lock screen\" into jb-dev\n\n* commit \u002717990395bc62f8ce1bae4f1880899f231a8e613b\u0027:\n Fix issue #6717667: expanded notification actions don\u0027t work on the lock screen\n" }, { "commit": "b4215267f342759c8bdad02ed124dae4bb6d6833", "tree": "a46f3dff34c7a776997ef1060280eca7e46f575a", "parents": [ "4844fccc793078f44c8bffd1707ac589fad14f6e", "fca66cd828e214fe7494e46c7daa2879dfc3210d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 25 17:37:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 25 17:37:13 2012 -0700" }, "message": "am fca66cd8: Merge \"DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses\" into jb-dev\n\n* commit \u0027fca66cd828e214fe7494e46c7daa2879dfc3210d\u0027:\n DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses\n" }, { "commit": "9e608c12186d308fb1711e8824901fdf931a3a96", "tree": "16fd48827a6d9b2885db3cb2e11ab7af12537b9e", "parents": [ "17990395bc62f8ce1bae4f1880899f231a8e613b", "42e620caf0407f1b5e02935ac4323742c65459fd" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 25 17:35:49 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 25 17:35:49 2012 -0700" }, "message": "Merge \"Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.\" into jb-dev" }, { "commit": "17990395bc62f8ce1bae4f1880899f231a8e613b", "tree": "3e27e810159e377634395ac1daf9939169a26313", "parents": [ "fca66cd828e214fe7494e46c7daa2879dfc3210d", "1927ae8a56a010919a7535231fa0f7db70f7e152" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 25 17:35:36 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 25 17:35:36 2012 -0700" }, "message": "Merge \"Fix issue #6717667: expanded notification actions don\u0027t work on the lock screen\" into jb-dev" }, { "commit": "fca66cd828e214fe7494e46c7daa2879dfc3210d", "tree": "e835cf394145b39486bfdaf90cb6ddd4422feb2e", "parents": [ "5d88c14cd39d1100e28f7e340874655ab7a42904", "357d99c61d1c97199ca421408b3e26566e879f2a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 25 17:35:21 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 25 17:35:21 2012 -0700" }, "message": "Merge \"DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses\" into jb-dev" }, { "commit": "eca64b391408dfdb9ff3ae03fc39cfdb6918f3ad", "tree": "0dbed5da46e6c62559e100c78132693957cbcd3b", "parents": [ "e9b4b3e94d396d176338c62f8c9f4c183b340f9b" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Jun 25 16:37:32 2012 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Jun 25 16:39:45 2012 -0700" }, "message": "Use removePackageLI instead of removing mPackages\n\nWhen adding an system app via OTA, trying to remove it from mPackages\ndirectly doesn\u0027t work. The ContentProviders and other things aren\u0027t\nremoved and point to the hidden system app\u0027s applicationInfo instead of\nthe updated app.\n\nBug: 6685263\nChange-Id: I487cf518e0e3c60fae736e9b974617023a7dee8d\n" }, { "commit": "0086ec0d3009bc8c80e1330cd73ba534aa45f489", "tree": "81c9c2ce9c099f990348b8f929ebca06dd8431b7", "parents": [ "db65cc520ebb3f9cfafa4a9d5be9f07621814213", "d48cf0c0ce5f9458802d2be8671c85fa027a74a0" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Jun 25 15:28:46 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 25 15:28:46 2012 -0700" }, "message": "am d48cf0c0: Merge \"Don\\\u0027t wait until boot timeout if there is no wallpaper.\" into jb-dev\n\n* commit \u0027d48cf0c0ce5f9458802d2be8671c85fa027a74a0\u0027:\n Don\u0027t wait until boot timeout if there is no wallpaper.\n" }, { "commit": "db65cc520ebb3f9cfafa4a9d5be9f07621814213", "tree": "c8392436f0f1904bd8cf22f309baa2736639286a", "parents": [ "4415838b4b7014cee4a4bd1bfaeafa39d177a503", "a3a59a2fa7e3b3b044b41d2741118be37c57509a" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Jun 25 15:28:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 25 15:28:44 2012 -0700" }, "message": "am a3a59a2f: Merge \"Don\\\u0027t enable input dispatch until display enabled.\" into jb-dev\n\n* commit \u0027a3a59a2fa7e3b3b044b41d2741118be37c57509a\u0027:\n Don\u0027t enable input dispatch until display enabled.\n" }, { "commit": "1927ae8a56a010919a7535231fa0f7db70f7e152", "tree": "ef0c02adbd41100faf4a18d553ad7206584991d2", "parents": [ "e9b4b3e94d396d176338c62f8c9f4c183b340f9b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 22 15:21:36 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 25 14:28:48 2012 -0700" }, "message": "Fix issue #6717667: expanded notification actions don\u0027t work on the lock screen\n\nFLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake.\n\nInstead, and the infrastructure for the status bar to take care\nof closing and hiding things itself when you press these buttons,\njust like it does for the main Intent of the notification.\n\nBug: 6717667\nChange-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1\n" }, { "commit": "42e620caf0407f1b5e02935ac4323742c65459fd", "tree": "950736ba92c530521a1a1f417db42be759a6a0b3", "parents": [ "e9b4b3e94d396d176338c62f8c9f4c183b340f9b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Jun 24 13:20:51 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 25 14:27:41 2012 -0700" }, "message": "Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.\n\nMake sure that all cases where we remove an activity from the history\nstack, we call resumeTopActivityLocked() to cause the home activity\nto be launched if the stack is now empty.\n\nAlso fixed a problem where some timeouts would not be removed when destroying\nan activity, and a race condition in boot that would cause the\nPhoneWindowManager to initially start out with the home key not working.\n\nBug: 6381224\nChange-Id: If046bb01aed624b0d9ee3bbaaba68ed6b98fd1d0\n" }, { "commit": "780c46fc9197f7ecb258e2c229824749f9e93806", "tree": "3b1d4d9ee8870eadb6aeac0d34f8b5f8d1b4b2e1", "parents": [ "08a746a0c60d19eb2211924ffd9fe1e452a261a6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Jun 24 12:15:38 2012 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Jun 24 13:51:41 2012 -0700" }, "message": "Don\u0027t wait until boot timeout if there is no wallpaper.\n\nWhen launching only core apps, the wallpaper service\nis not started. Without this change the WM waits\nup to 30 seconds for the wallpaper window to be created even\nthough it will never happen. This introduces a significant\ndelay before the boot animation is dismissed so the user can\nenter a decryption password.\n\nBug: 6263070\nChange-Id: Ia975127a0bf09cf99818f7cc4fd6c0264b740ec6\n" }, { "commit": "08a746a0c60d19eb2211924ffd9fe1e452a261a6", "tree": "9b54a89e96467fb9c770565108aa7085703bff12", "parents": [ "40a0376ea5ac597d8df04fd3e4ad8bde7ac7c9ec" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Jun 24 12:14:49 2012 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Jun 24 12:23:58 2012 -0700" }, "message": "Don\u0027t enable input dispatch until display enabled.\n\nBug: 6263070\nChange-Id: I05d036fc1d9ec06d164d6743d45bb3f199cfab47\n" }, { "commit": "3fee3eb7e0a83cd7fc8df3994692232ba6953c02", "tree": "47241a05f98cca315c519fccde432b84cf851254", "parents": [ "de9d2fb699bd5162a66910e68db989a7bad0575b", "5beeb04b528fec320d3453601b4adf4efbd8eba7" ], "author": { "name": "Hiroshi Lockheimer", "email": "hiroshi@google.com", "time": "Fri Jun 22 15:34:56 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 22 15:34:56 2012 -0700" }, "message": "am 5beeb04b: Merge \"Don\\\u0027t display based on a dummy animation.\" into jb-dev\n\n* commit \u00275beeb04b528fec320d3453601b4adf4efbd8eba7\u0027:\n Don\u0027t display based on a dummy animation.\n" }, { "commit": "5beeb04b528fec320d3453601b4adf4efbd8eba7", "tree": "715a8a2741a2037abbd242ab7f083571ff4b337a", "parents": [ "ddeb7bd3c7593d51d4d2bfd9fe39d5f0ffa05d89", "9c5bf3b36f3dd658320f34dbaee9d6d453606bf4" ], "author": { "name": "Hiroshi Lockheimer", "email": "hiroshi@google.com", "time": "Fri Jun 22 15:33:15 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 22 15:33:15 2012 -0700" }, "message": "Merge \"Don\u0027t display based on a dummy animation.\" into jb-dev" }, { "commit": "9c5bf3b36f3dd658320f34dbaee9d6d453606bf4", "tree": "199208f4d236842652cb515a4b728e64a1662a25", "parents": [ "f41209568617f4acfaf6dea8f8b2cbe9c2994a3e" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jun 22 15:19:13 2012 -0700" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Jun 22 15:19:13 2012 -0700" }, "message": "Don\u0027t display based on a dummy animation.\n\nThe Starting window was being made visible early because the app\ntoken had the dummy animation set. When the real animation started\nthe Starting window picked it up and became transparent causing\nthe underlying window to become visible again \u003d\u003e jank.\n\nFixes bug 6691421.\n\nChange-Id: I95fe88d2887760e6da3adedeb6be300eb6755283\n" }, { "commit": "037faad0f437c5fdc5435c030ef03d61de75090f", "tree": "8594cf6680160c74196c1f84f4767adfc63cffd3", "parents": [ "cc6cf51b80eabd199f797f40b76f7980c343962b", "ab779e0bb2948bdfac461f931f9d165a5a38b84a" ], "author": { "name": "Michael Jurka", "email": "mikejurka@google.com", "time": "Fri Jun 22 14:39:52 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 22 14:39:52 2012 -0700" }, "message": "am ab779e0b: Merge \"Increase bitmap memory cap for widgets (Bug 6597440)\" into jb-dev\n\n* commit \u0027ab779e0bb2948bdfac461f931f9d165a5a38b84a\u0027:\n Increase bitmap memory cap for widgets (Bug 6597440)\n" }, { "commit": "ab779e0bb2948bdfac461f931f9d165a5a38b84a", "tree": "9ef57efd26eceb10527fec43cfcc7f29f7913873", "parents": [ "40a9da3b9e5ae9d4d03b89f61f24ee6d96bd3bf4", "e92aad432add317793a69a34eab5d271962df220" ], "author": { "name": "Michael Jurka", "email": "mikejurka@google.com", "time": "Fri Jun 22 14:38:12 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 22 14:38:12 2012 -0700" }, "message": "Merge \"Increase bitmap memory cap for widgets (Bug 6597440)\" into jb-dev" }, { "commit": "e92aad432add317793a69a34eab5d271962df220", "tree": "0bdc64488aa4736f64b40918c055e862a1bc1adb", "parents": [ "137bfad24f26fb3526329aadfe02d751e87027b5" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Fri Jun 22 14:11:47 2012 -0700" }, "committer": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Fri Jun 22 14:12:39 2012 -0700" }, "message": "Increase bitmap memory cap for widgets (Bug 6597440)\n\nChange-Id: I4149b8c5f204f10ebf0ef1f8d03709c0559178d0\n" }, { "commit": "357d99c61d1c97199ca421408b3e26566e879f2a", "tree": "d04d523390c979498bf73352a3fc1888907399fc", "parents": [ "3cd4624448dcaddecc75461ef645da72e7e5c098" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Jun 20 18:37:16 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 22 12:50:50 2012 -0700" }, "message": "DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses\n\nIn the course of the window manager refactoring into a separate\nlayout state, we introduced a bad interaction between the two\nsides of the world. This resulting in multiple hops needed between\nthe two sides after an application has said it is finished drawing\nits window, until the window/app transition is actually started.\nEspecially since these hops require going through the anim side\nwhich is vsynced (so will delay its operation until the next frame),\nthis could introduce a notable delay until the window is first shown.\n\nFix this by re-arranging the code to make one straight path from\nwhen a window reports it is shown to us starting the app transition\nthat is waiting for it. This change also includes various improvements\nto debugging code that was done while working on it.\n\nChange-Id: I7883674052da1a58df89cd1d9b8d754843cdd3db\n" }, { "commit": "176a8a8b7cba2654f50617b14a841ef977b95b11", "tree": "1e81d4a547b68372609898195ecf3a2ee6ce0b6c", "parents": [ "b8e1319f0aef6880c46de9f2a563fd1ae80c84c9", "0b9b053ce6fdc48e922b6af37fe747b4ef40324a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 22 10:40:53 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 22 10:40:53 2012 -0700" }, "message": "am 0b9b053c: Merge \"Don\\\u0027t crash in window manager if we fail getting .apk resources.\" into jb-dev\n\n* commit \u00270b9b053ce6fdc48e922b6af37fe747b4ef40324a\u0027:\n Don\u0027t crash in window manager if we fail getting .apk resources.\n" }, { "commit": "0b9b053ce6fdc48e922b6af37fe747b4ef40324a", "tree": "2f06a25a24041bb95389997ef26fb070f1ba2bee", "parents": [ "50e990c64fa23ce94efa76b9e72df7f8ec3cee6a", "0b800190d71bbe3459149f760f49dfa6208c0e21" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 22 10:38:45 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 22 10:38:45 2012 -0700" }, "message": "Merge \"Don\u0027t crash in window manager if we fail getting .apk resources.\" into jb-dev" }, { "commit": "a6b8189f8e152caafe5900cff0f068517a70088d", "tree": "d181f31fa9430ce51c83fe040b19943f600473ae", "parents": [ "a3bd05f212a06551d8de403afbb7808189186ea3", "9ce1ea3aa744fdd5a63ecedd07859fb2faa6f8e1" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Jun 21 18:58:59 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 21 18:58:59 2012 -0700" }, "message": "am 9ce1ea3a: Merge \"Fix starting window problems.\" into jb-dev\n\n* commit \u00279ce1ea3aa744fdd5a63ecedd07859fb2faa6f8e1\u0027:\n Fix starting window problems.\n" }, { "commit": "f41209568617f4acfaf6dea8f8b2cbe9c2994a3e", "tree": "09108d2f9ef40fa0ca07ffd6935a0df5074331ba", "parents": [ "95cf8c1121a95750358ee99169c96d8d4dfb4950" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Jun 21 18:25:39 2012 -0700" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Jun 21 18:25:39 2012 -0700" }, "message": "Fix starting window problems.\n\nThree problems fixed:\n1. When one Activity took over for another Activity not all of the\nstarting window state was being copied over. Now copying over more\nparameters.\n\n2. When the visibility of an Activity was being changed the dummy\nanimation was overwriting the existing animation. If that animation\nwas the starting window animating then it started over when the\ndummy animation was assigned. Now the dummy animation no longer\nreplaces an existing starting window animation.\n\n3. The test for whether to animate away the starting window only\nlooked to see if the Activity had already drawn a window but did\nnot include the starting window. This caused the starting window\nto immediately be hidden when the Activity was removed if no\nwindows were drawn, thereby exposing the fading window behind.\nNow the starting window is included in the hasAppShownWindows test\nand is animated away if it is exposed.\n\nFixes bug 6691421.\n\nChange-Id: I4d32a1546c201652574a44d9e7f2752f1f1eb5a6\n" }, { "commit": "eef58e858a24c15fff303622dfe3990799e03b51", "tree": "5d4607c622a11067cbb9cb3b7c161755609dfda0", "parents": [ "ae017c55824ca345186b0c9fc204401153bd8a23", "e06e1619a153a902083d2a1a0c01c86d3c7e546e" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 21 15:52:23 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 21 15:52:23 2012 -0700" }, "message": "am e06e1619: Merge \"Fix issue #6700897: Activity paused by activating the...\" into jb-dev\n\n* commit \u0027e06e1619a153a902083d2a1a0c01c86d3c7e546e\u0027:\n Fix issue #6700897: Activity paused by activating the...\n" }, { "commit": "0b800190d71bbe3459149f760f49dfa6208c0e21", "tree": "a2f647aa7cdc71926a2c4d03157714f2252debf5", "parents": [ "d5353b475001f19e3cbc9c1a4165c9e6038a812f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 21 15:29:36 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 21 15:29:36 2012 -0700" }, "message": "Don\u0027t crash in window manager if we fail getting .apk resources.\n\nThis normally shouldn\u0027t noramlly happen, but it can in the case of\nbug 6647334 (crash in LoadedApk.makeApplication) where the package\nmanager information becomes inconsistent, and it could also happen\nif an app was uninstalled or started updating at just the right\ntime during a launch.\n\nBug: 6647334\nChange-Id: Iba22efe1d646cdac46099b2135466309577dfa54\n" }, { "commit": "f530ac323b7230ec7b198f0af3f2fa1158913a08", "tree": "b1291463e326d13b1be54e705aad732e7ebe6448", "parents": [ "d5353b475001f19e3cbc9c1a4165c9e6038a812f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 21 14:17:48 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 21 14:17:48 2012 -0700" }, "message": "Fix issue #6700897: Activity paused by activating the...\n\n...lock screen does not response to onNewIntent()\n\nWe now keep activities stopped even while the lock screen is\ndisplayed. (We used to keep them stopped while the screen was\noff, and then resume the top activity when the screen was turned\non even though they are covered by the lock screen.)\n\nWhen a new intent is being delivered to an application, if it\nis not resumed it is held in a pending list until the next\ntime the activity is resumed. Unfortunately that means for\nthe case where the activity is being held stopped due to the\nscreen off or lock screen, it will not receive any new intents,\neven though it is at the top of the stack.\n\nFix this by adding an additional condition that allows the new\nintent to be delivered immediately if the activity manager is\nsleeping and the target activity is at the top of the stack.\n\nAlso some debug output improvements, since pending new intents\nwere not being included in the debug output, making it impossible\nto see we were in that situation.\n\nChange-Id: I5df82ac21657f1c82e05fd8bf21474e883f44e6f\n" }, { "commit": "ae017c55824ca345186b0c9fc204401153bd8a23", "tree": "829e1afb2882cfbae8fa021f4709807f4f42167f", "parents": [ "42a6516de996b547ecbfc53fd7e101f2b8b6c490", "a9543a3dad0da58f30580bdf99b76bc2ab97a2df" ], "author": { "name": "Kenny Root", "email": "kroot@android.com", "time": "Thu Jun 21 14:17:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 21 14:17:13 2012 -0700" }, "message": "am a9543a3d: Merge \"Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks.\"\n\n* commit \u0027a9543a3dad0da58f30580bdf99b76bc2ab97a2df\u0027:\n Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks.\n" }, { "commit": "a9543a3dad0da58f30580bdf99b76bc2ab97a2df", "tree": "50e01e95b6f6634b8db118b815035eab9c831cbb", "parents": [ "20d6caf8888d4114b6ce79d93c7c9cf903ad8c22", "83d9eda9c2c411e3480c52f01e192bf3c86be8e9" ], "author": { "name": "Kenny Root", "email": "kroot@android.com", "time": "Thu Jun 21 11:05:54 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jun 21 11:05:55 2012 -0700" }, "message": "Merge \"Pass additional inputs when spawning apps via the Zygote and add SELinux permission checks.\"" }, { "commit": "071ed3348739cb3f2bb9ef169067440c8c61b881", "tree": "20034c4e7478f758cef6de89a09557541376b6ec", "parents": [ "e5934259fc80b13ee6f54309fa23ee1889cb501a", "fc32ec9a51cb78e58ae673abc327f4ef7be98fad" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Jun 20 22:31:17 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 20 22:31:17 2012 -0700" }, "message": "am fc32ec9a: Merge \"Don\\\u0027t reset brightness to 0 on initial boot.\" into jb-dev\n\n* commit \u0027fc32ec9a51cb78e58ae673abc327f4ef7be98fad\u0027:\n Don\u0027t reset brightness to 0 on initial boot.\n" }, { "commit": "8e306a68e84453d6173229e8bcff32cf170eb4a1", "tree": "950cd1d8fd5c8733cea5e14f5c7ca32ed18afe1a", "parents": [ "dce5af632ce8899905fbf187b9505f6753d5a562" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Jun 20 19:20:57 2012 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Jun 20 19:46:32 2012 -0700" }, "message": "Don\u0027t reset brightness to 0 on initial boot.\n\nBug: 6705012\nChange-Id: I8114fda081784abbe720d5eaa637aa5234b5a947\n" }, { "commit": "3a9ff158fe45b3ee986dfa5f3c56fa48f781a5a9", "tree": "1de80809721c788ff6fe412a3d27a816a71b1a01", "parents": [ "7ea49798355955791fafbee8c3f5cc50313e46a8", "56802678a72157675382910e37857cf78e1cefcb" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Wed Jun 20 13:03:14 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 20 13:03:14 2012 -0700" }, "message": "am 56802678: Merge \"Workaround: Never reset the default IME if the system is not ready\" into jb-dev\n\n* commit \u002756802678a72157675382910e37857cf78e1cefcb\u0027:\n Workaround: Never reset the default IME if the system is not ready\n" }, { "commit": "56802678a72157675382910e37857cf78e1cefcb", "tree": "ecfc2a58b860083dde9edb1d9398b25ede9bd214", "parents": [ "edc34cf55482faa25b48e867bd51ecec74dbd0e8", "4c0e7152e74d091eb78af8baacd38287ba95a1a1" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Wed Jun 20 13:01:09 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 20 13:01:09 2012 -0700" }, "message": "Merge \"Workaround: Never reset the default IME if the system is not ready\" into jb-dev" }, { "commit": "80a3c3ea6f69df461c7e722c8e16362ce4bb60f3", "tree": "310191b8b0010b565650f7770b5de57e0766044e", "parents": [ "b0222bb19e8d850ccbd74c4f0832d73ae552df8d", "d0d3a850650ade52198e7836f87a0e27ad2d6b41" ], "author": { "name": "Charles Chen", "email": "clchen@google.com", "time": "Wed Jun 20 12:14:08 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 20 12:14:08 2012 -0700" }, "message": "am d0d3a850: Merge \"Fixing gesture recognition configuration in TouchExplorer.\" into jb-dev\n\n* commit \u0027d0d3a850650ade52198e7836f87a0e27ad2d6b41\u0027:\n Fixing gesture recognition configuration in TouchExplorer.\n" }, { "commit": "d0d3a850650ade52198e7836f87a0e27ad2d6b41", "tree": "2ce07e5777894f93c6581df320c03b7b843d3239", "parents": [ "0fa4d30b03c4307ca5d461aa4450b672b6850ea1", "ea6fbc0981564f7bbf4c6fbb63af0175415121ce" ], "author": { "name": "Charles Chen", "email": "clchen@google.com", "time": "Wed Jun 20 12:12:07 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 20 12:12:07 2012 -0700" }, "message": "Merge \"Fixing gesture recognition configuration in TouchExplorer.\" into jb-dev" }, { "commit": "b0222bb19e8d850ccbd74c4f0832d73ae552df8d", "tree": "20d63a4b7991c5827d0256b0bf3332e00644ca2f", "parents": [ "cb1c45ed80df368051368a478fa931d3333c99f6", "0fa4d30b03c4307ca5d461aa4450b672b6850ea1" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Jun 20 12:08:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 20 12:08:03 2012 -0700" }, "message": "am 0fa4d30b: Merge \"Fix issue #6686339: 2 taps required to launch notification...\" into jb-dev\n\n* commit \u00270fa4d30b03c4307ca5d461aa4450b672b6850ea1\u0027:\n Fix issue #6686339: 2 taps required to launch notification...\n" }, { "commit": "0fa4d30b03c4307ca5d461aa4450b672b6850ea1", "tree": "9d95ba57363cd473b66fa77e525083d35fef8c91", "parents": [ "b6ce1f311ce154af713ebc4f543fc2aaed446939", "6e2281d44c9b71a03a50ed24d654927111cd2b72" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Jun 20 12:06:38 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 20 12:06:38 2012 -0700" }, "message": "Merge \"Fix issue #6686339: 2 taps required to launch notification...\" into jb-dev" }, { "commit": "4c0e7152e74d091eb78af8baacd38287ba95a1a1", "tree": "f9658d9e38ec255a3d81c982ffdd61a3b938d499", "parents": [ "17c1425f5ab5c6f734a700d74b5bd8118f289cd5" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Wed Jun 20 20:08:44 2012 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Thu Jun 21 02:22:24 2012 +0900" }, "message": "Workaround: Never reset the default IME if the system is not ready\n\nBug: 6685037\nChange-Id: Ifb311f85154beadd4787ec73669bedfdf1f5172d\n" }, { "commit": "6e2281d44c9b71a03a50ed24d654927111cd2b72", "tree": "a5e6da073ffdf3e695e1dfa0a33c258f49bf068e", "parents": [ "0abe556d28f5f5d395559cc6567b05939d1b2640" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 19 17:48:32 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 19 17:54:24 2012 -0700" }, "message": "Fix issue #6686339: 2 taps required to launch notification...\n\n...or settings from lock screen\n\nWhen a window is drawn, the code to determine whether it should now\nbe shown was calling WindowState.isReadyForDisplay(). Part of the\ncondition of this function is that it is not ready if a policy is\nforcing the window to be hidden -- which is the case when the lock\nscreen is shown. As a result, we wouldn\u0027t show the window at that\npoint, so wouldn\u0027t tell the activity manager that the token\u0027s windows\nare visibible, and wouldn\u0027t tell the lock screen to go away.\n\nThis adds a new variation WindowState.isReadyForDisplayIgnoringKeyguard(),\nwhich is the same as the original method but ignores the policy visibility\nfor app windows. This allows windows to be go through the complete\npath of handling when the window is finally drawn and telling the\nactivity manager about it, even if behind the lock screen. By making it\na separate function, we don\u0027t impact any other code that is calling the\nold function and may be relying on its behavior.\n\nAlso cleaned up a little of the dumpsys output. Most important, the\nnew ANR section is now moved to the top, since we want\n\"adb shell dumpsys window\" to still give a nice summary of what we\nnormally care about -- the window stack and important global state.\n\nChange-Id: Ica3ea85ce46f3f5f5cd2cc30fbd9de13d3885a57\n" }, { "commit": "ea6fbc0981564f7bbf4c6fbb63af0175415121ce", "tree": "8f20738a0b1210db9e0ada3bfed17fc834e1fd1f", "parents": [ "1b36a68f607538bd090c33b31bd418169657ff6c" ], "author": { "name": "Casey Burkhardt", "email": "caseyburkhardt@google.com", "time": "Tue Jun 19 16:24:10 2012 -0700" }, "committer": { "name": "Casey Burkhardt", "email": "caseyburkhardt@google.com", "time": "Tue Jun 19 16:31:54 2012 -0700" }, "message": "Fixing gesture recognition configuration in TouchExplorer.\n\nThis fix adjusts the sensitivity of the gesture recognizer by\neliminating gesture rotation in the recognition process.\n\nBug:6697119\nChange-Id: Ic767f513c05210b27e583338c4f0adcaa1c4c625\n" }, { "commit": "9a5a8aafad89f3e05bb9c17c56ea4658413a4452", "tree": "055d037ce101f11b9e4f8285a700379b835bf920", "parents": [ "7324b21ca07c89c01fd4bfea6c2d651c3e31146a", "5785e05d44cd1f4453b887ac8de05ff3466b179e" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Jun 19 15:11:33 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 19 15:11:33 2012 -0700" }, "message": "am 5785e05d: Merge \"Clear sendingToBottom when animation is complete.\" into jb-dev\n\n* commit \u00275785e05d44cd1f4453b887ac8de05ff3466b179e\u0027:\n Clear sendingToBottom when animation is complete.\n" }, { "commit": "5785e05d44cd1f4453b887ac8de05ff3466b179e", "tree": "88ff9de7215473c09ad892a0f72e07617aa3ced8", "parents": [ "c2585467107995f3130872eb7b721f3dbbcdf505", "3f99fde465e98fb6f5a3d6dd661836ba230bf03c" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Jun 19 15:08:41 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 19 15:08:41 2012 -0700" }, "message": "Merge \"Clear sendingToBottom when animation is complete.\" into jb-dev" }, { "commit": "3f99fde465e98fb6f5a3d6dd661836ba230bf03c", "tree": "b0d7b886658ec656a2f802af946377f69b1d2edc", "parents": [ "5bb835a95942b0b313b2fa4e3f05941e630f9be7" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Jun 19 14:10:01 2012 -0700" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Jun 19 14:10:01 2012 -0700" }, "message": "Clear sendingToBottom when animation is complete.\n\nWas counting on moving the app to the top to clear the flag\nindicating that the app was being sent to the bottom. Since this\ndid not always happen the sendingToBottom flag was occasionally\nleft set. In this case the focus was skipped for that app and\nconsequently input was never propagated to it.\n\nThis fix clears the sendingToBottom flag each time the app\nanimations are completed.\n\nFixes bug 6691421.\n\nChange-Id: I6f851dc5bedca95182db8490d87c876a71ad5fde\n" }, { "commit": "de2dbfff537f457fdd8a5ef2145b41629a7b09a2", "tree": "3b641b149e5e09bf8678203b4a0ec2ccf7f2e544", "parents": [ "ecf5bc551eddacfb4a4041d614f8fe50672659ae", "0abe556d28f5f5d395559cc6567b05939d1b2640" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Jun 19 14:02:51 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 19 14:02:51 2012 -0700" }, "message": "am 0abe556d: Handle SCREEN_ON/OFF broadcasts without blocking.\n\n* commit \u00270abe556d28f5f5d395559cc6567b05939d1b2640\u0027:\n Handle SCREEN_ON/OFF broadcasts without blocking.\n" }, { "commit": "0abe556d28f5f5d395559cc6567b05939d1b2640", "tree": "a6c328726c1f7cff8db804cb40742133147aae51", "parents": [ "fe54cb6f3da7fe95d5141d97b0c6780e001ad058" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Jun 19 13:32:22 2012 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Jun 19 13:32:22 2012 -0700" }, "message": "Handle SCREEN_ON/OFF broadcasts without blocking.\n\nNetworkPolicy currently uses a single background thread to process\nvarious broadcasts. When processing other broadcasts, this thread\ncan block our handling of SCREEN_ON/OFF, which are sent as ordered\nbroadcasts.\n\nThis change moves SCREEN_ON/OFF handling to the main thread, and\ndispatches a one-way message to the background thread, allowing the\nordered broadcast to always proceed.\n\nBug: 6677047\nChange-Id: I52de2c7b75beb8059bb87e123689ba4a9c4ae349\n" }, { "commit": "ae3e5bc93f1077615b4ec8f6fbd06509241d25de", "tree": "caef4b63631f540ed6763372ae7c653fa33b3bd1", "parents": [ "277c09f6c16c4adfd50407e2fa4dbf61a0e06e55", "89f5a4624bfa487cb5fb192d9c3c9b30937b3f26" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jun 18 18:04:42 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 18 18:04:42 2012 -0700" }, "message": "am 89f5a462: Merge \"More paths for turning on screen immediately.\" into jb-dev\n\n* commit \u002789f5a4624bfa487cb5fb192d9c3c9b30937b3f26\u0027:\n More paths for turning on screen immediately.\n" }, { "commit": "89f5a4624bfa487cb5fb192d9c3c9b30937b3f26", "tree": "7688f7f41aa471ba8df3520966b6563b67a26670", "parents": [ "56bb344ccfd3d261cea9987c98a17d0820279b17", "75fc9de2587f493f79ac6719a57ce76f5b3e73df" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jun 18 18:01:53 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 18 18:01:53 2012 -0700" }, "message": "Merge \"More paths for turning on screen immediately.\" into jb-dev" }, { "commit": "75fc9de2587f493f79ac6719a57ce76f5b3e73df", "tree": "54834e81fb3c0d8f8994dc0a82ad20e7564e7f6d", "parents": [ "8b9c6d51d59898375089e9708325604c227812e0" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jun 18 16:53:27 2012 -0700" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Mon Jun 18 16:53:27 2012 -0700" }, "message": "More paths for turning on screen immediately.\n\nThis fix forces the path through the updateLightsLocked method to turn\nthe screen on immediately if mWaitingForFirstLightSensor is true. Also\ndo not clear mWaitingForFirstLightSensor if mPreparingForScreenOn\nis true. Wait until it turns false.\n\nFixes bug 6612418.\n\nChange-Id: I03407e748cce4906a73de1f15df1654649b133c4\n" }, { "commit": "56b3a321e7c6f03d1bc0c5c0915d56bc46b7a33e", "tree": "c0b9f29e66733fd1b828960258f09a1da25a5265", "parents": [ "81c61fda9a1b45db4c06d2db2cf24b42045d4f76", "1991850de7bbcc534c2cb457f33055c533542136" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 18 16:21:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 18 16:21:43 2012 -0700" }, "message": "am 1991850d: Merge \"Implement issue #6680894: Provide a way to configure app defaults...\" into jb-dev\n\n* commit \u00271991850de7bbcc534c2cb457f33055c533542136\u0027:\n Implement issue #6680894: Provide a way to configure app defaults...\n" }, { "commit": "1991850de7bbcc534c2cb457f33055c533542136", "tree": "d0ed7d0ccc54cf989f8a76ee82d1583b68e6ee70", "parents": [ "c4b0d098d60ad532cebb3c043f3a1cdb39033f1f", "fc8b7fe02630f64a1d6c8ecb06f4c250e7478f1d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 18 16:19:56 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 18 16:19:56 2012 -0700" }, "message": "Merge \"Implement issue #6680894: Provide a way to configure app defaults...\" into jb-dev" }, { "commit": "fc8b7fe02630f64a1d6c8ecb06f4c250e7478f1d", "tree": "b074c7f7130c18acc8d91b2f0ec9afd19f123ac8", "parents": [ "4cb3b76caa004867bac43f0001072e24bfa8c120" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 18 15:38:12 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 18 15:38:12 2012 -0700" }, "message": "Implement issue #6680894: Provide a way to configure app defaults...\n\n...for a smoother OOB experience\n\nWay provided.\n\nPut your defaults in system/etc/preferred-apps/*.xml.\n\nFigure out what to put there with \"adb shell dumpsys package preferred-xml\".\n\nBug: 6680894\nChange-Id: Ia06bb0061876274a5f80bf06d1ba5ad155edc323\n" }, { "commit": "81c61fda9a1b45db4c06d2db2cf24b42045d4f76", "tree": "63a630967968bc9420e6b8a405abf280dc44bc35", "parents": [ "a10b1a738dfa8fcf094fec555e7d85dba179f5fc", "c4b0d098d60ad532cebb3c043f3a1cdb39033f1f" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Jun 18 14:17:53 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 18 14:17:53 2012 -0700" }, "message": "am c4b0d098: Merge \"Fix an NPE and possible unsynchronized call of Locked method.\" into jb-dev\n\n* commit \u0027c4b0d098d60ad532cebb3c043f3a1cdb39033f1f\u0027:\n Fix an NPE and possible unsynchronized call of Locked method.\n" }, { "commit": "ee172414877d64ebfbcdbadf10691d04a5eee684", "tree": "8b0f996e44fe81568fba0d51f7d57498792181d6", "parents": [ "c4947277e821153fc01256a425e4cbbe34a06eda" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Jun 18 12:58:03 2012 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Jun 18 12:59:13 2012 -0700" }, "message": "Fix an NPE and possible unsynchronized call of Locked method.\n\nBug: 6680398\nChange-Id: Id5ef4fa82b2a5ef5e9c3934ca95156143f91e5e2\n" }, { "commit": "7947698096d4b09bb0f662fdca89cfa5d475743e", "tree": "d5fd18cc9428f23ca1ec4b72a6b57b096ad77b33", "parents": [ "23b15320ec57f49cb8e87210e37bcd4b146cb204", "d7a04de16798acc04ec0a89a0c7d9f1cf60d1521" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Jun 18 10:34:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 18 10:34:25 2012 -0700" }, "message": "am d7a04de1: Capture window manager\\\u0027s last ANR state in bug report.\n\n* commit \u0027d7a04de16798acc04ec0a89a0c7d9f1cf60d1521\u0027:\n Capture window manager\u0027s last ANR state in bug report.\n" }, { "commit": "608601924651531210ad3c6179d02c471f42dddf", "tree": "ec1b7516c360292123b2140c0d19a6bc2c68fa11", "parents": [ "772ddc0cf28625964435edc5e86048e353c425fa", "d8bbf96a84cba7c31fa1535fe2467520f2aa0198" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 18 10:33:05 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 18 10:33:05 2012 -0700" }, "message": "am d8bbf96a: Merge \"Fix issue #6664140: Time to lock should work even Stay awake...\" into jb-dev\n\n* commit \u0027d8bbf96a84cba7c31fa1535fe2467520f2aa0198\u0027:\n Fix issue #6664140: Time to lock should work even Stay awake...\n" }, { "commit": "99e33bf14b2be799efe02b9a8a42b25abc0fced3", "tree": "eb98e2936daddcdba426ebd385dfbd2f7f0f0542", "parents": [ "33ef4ee71277888304a3c67fdd8dfddd728b4c88", "17b9cec1b6fedd0e54ff61f5a12f0e515add70ab" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 18 10:31:05 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 18 10:31:05 2012 -0700" }, "message": "am 17b9cec1: Merge \"Fix issue #6636731: Mariner animation ring gets stuck\" into jb-dev\n\n* commit \u002717b9cec1b6fedd0e54ff61f5a12f0e515add70ab\u0027:\n Fix issue #6636731: Mariner animation ring gets stuck\n" }, { "commit": "d7a04de16798acc04ec0a89a0c7d9f1cf60d1521", "tree": "ad6fb448cd393aa827737680f46a891433215bf3", "parents": [ "22aa51202652efbd55094217a046b8e5ecb7afe2" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Jun 17 14:17:52 2012 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Jun 17 15:55:46 2012 -0700" }, "message": "Capture window manager\u0027s last ANR state in bug report.\n\nCurrently just grabbing the window state but we could grab\nother things as part of the last ANR report.\n\nBug: 6680398\nChange-Id: I23aa70907b1bdcb21c8acc556fde196ca790ef6a\n" }, { "commit": "2fe8fb276c28372edb60f5bb10e172c19ef2671b", "tree": "600e22507e05e4250e071c4e287d9f7544fe598c", "parents": [ "87959cdd8560e743956a71bb687799e94053e086" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 15 17:05:25 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 15 17:23:16 2012 -0700" }, "message": "Fix issue #6664140: Time to lock should work even Stay awake...\n\n...in Developer options is on\n\nDon\u0027t respect stay awake while on as long as a time to lock limit\nis being enforced. When we start enforcing one, make sure the\nsetting is off (since we won\u0027t be respecting it anyway).\n\nBug: 6664140\nChange-Id: Id07cb528afa0c64c7766341841c51771f507121d\n" }, { "commit": "6e3d6daa3753be0ce170c1140cddd945e01e0a03", "tree": "816d4e37a2e1f7bdf8b8c683bb0682520f439651", "parents": [ "734f0214ec04e6c734aeec78d15f6db478cfb55c" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 15 12:05:27 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 15 12:12:56 2012 -0700" }, "message": "Fix issue #6636731: Mariner animation ring gets stuck\n\nWeren\u0027t cleaning out any ActivityOptions that are still attached\nto a finishing activity.\n\nBug: 6636731\nChange-Id: If0520bbcbf1d4ce19d46ff769918893cefda9c87\n" }, { "commit": "4879c1e8b3ae01800290a3702526a601f4637692", "tree": "21d1360c5a3f19003f464415cc6d0afba4cc55b0", "parents": [ "655410e7b3c79bb705aaba0bdfc77ecdaa25d4ca", "734f0214ec04e6c734aeec78d15f6db478cfb55c" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 14 21:35:55 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 14 21:35:55 2012 -0700" }, "message": "am 734f0214: Merge \"Help out issue #6654729: CAB + screen off during playback\" into jb-dev\n\n* commit \u0027734f0214ec04e6c734aeec78d15f6db478cfb55c\u0027:\n Help out issue #6654729: CAB + screen off during playback\n" }, { "commit": "734f0214ec04e6c734aeec78d15f6db478cfb55c", "tree": "1ddcec621b2f27ecf5a809a9ce2933722fa9a687", "parents": [ "5c74bca49a48c3316aca9fed00d287cb8cbc2be4", "b80395c17de91151141411bda4252cdb10912580" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 14 21:33:48 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 14 21:33:48 2012 -0700" }, "message": "Merge \"Help out issue #6654729: CAB + screen off during playback\" into jb-dev" }, { "commit": "b80395c17de91151141411bda4252cdb10912580", "tree": "69384d4e3e0c441419ecaef28fa2fbd56db97bcb", "parents": [ "52d3465d0503a3362ec9335ae3de8e23b2ae75a3" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 14 19:38:20 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 14 19:38:20 2012 -0700" }, "message": "Help out issue #6654729: CAB + screen off during playback\n\nPeople generally expect, if they are using FLAG_KEEP_SCREEN_ON,\nthat the screen won\u0027t immediately dim after it is cleared, even\nif it has been passed the user activity timeout since the last\nuser interaction. So include the flag to reset the user activity\ntimeout when releasing its wake lock.\n\nChange-Id: If7a8fea8faef3edbf13dff10a2f248adc9e3ff0b\n" }, { "commit": "0d732fe68c6c68e93b6ca33d75e92b55ef95a97a", "tree": "57064fe98e456d669ca99a590b51b95014f4e191", "parents": [ "13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2", "0e44a6beeae8a17e81145b83f2dfb8f719d41f52" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jun 14 19:37:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 14 19:37:45 2012 -0700" }, "message": "am 0e44a6be: Merge \"Don\\\u0027t finish noHistory\u003d\"true\" activities behind the lock screen\" into jb-dev\n\n* commit \u00270e44a6beeae8a17e81145b83f2dfb8f719d41f52\u0027:\n Don\u0027t finish noHistory\u003d\"true\" activities behind the lock screen\n" }, { "commit": "0e44a6beeae8a17e81145b83f2dfb8f719d41f52", "tree": "a5999bb46ca49b4a53e6a6a1e5b85ebb6e386d17", "parents": [ "90b9f84c43145c51180c7253cd3a3f59862c2611", "d3f175c8179e8fbb275a5ef53b5a6fc4d88c1f24" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jun 14 19:35:58 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 14 19:35:58 2012 -0700" }, "message": "Merge \"Don\u0027t finish noHistory\u003d\"true\" activities behind the lock screen\" into jb-dev" }, { "commit": "5eed873f1076b685d3a8538894a49f29f85d1189", "tree": "2babeec489a03fc1bc55257bfacf75bd0f777368", "parents": [ "42fb511f1b5dd399bda3cd9fb3896bfe428a7837", "7661bc6c5afef4cca8ccee2f859906f8fb64087b" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jun 14 17:37:05 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 14 17:37:05 2012 -0700" }, "message": "am 7661bc6c: Merge \"Run the screen on/off broadcasts at foreground priority\" into jb-dev\n\n* commit \u00277661bc6c5afef4cca8ccee2f859906f8fb64087b\u0027:\n Run the screen on/off broadcasts at foreground priority\n" }, { "commit": "7661bc6c5afef4cca8ccee2f859906f8fb64087b", "tree": "f2c6326083a813cfaaa4f19e45157447ac6c7914", "parents": [ "2657a59f54e316ca11d7d9adf648e7001960f469", "2cb1357d1b96b7719073aa651e386a73667a2bb2" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jun 14 17:34:28 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 14 17:34:28 2012 -0700" }, "message": "Merge \"Run the screen on/off broadcasts at foreground priority\" into jb-dev" }, { "commit": "2cb1357d1b96b7719073aa651e386a73667a2bb2", "tree": "37d8214ab43e96822f9fbf98ca16a897fc7ac3b7", "parents": [ "a676cdab11ace948a054b5ca342727a3d0eb29b2" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jun 14 17:00:48 2012 -0700" }, "committer": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jun 14 17:00:48 2012 -0700" }, "message": "Run the screen on/off broadcasts at foreground priority\n\nBug 6643559\n\nChange-Id: I392f11dabea518238d0f4336c3663bf5c7d46146\n" }, { "commit": "d3f175c8179e8fbb275a5ef53b5a6fc4d88c1f24", "tree": "84d92cee67f8235752a549aa336e4282f1d812c6", "parents": [ "a676cdab11ace948a054b5ca342727a3d0eb29b2" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jun 14 14:16:54 2012 -0700" }, "committer": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jun 14 16:51:58 2012 -0700" }, "message": "Don\u0027t finish noHistory\u003d\"true\" activities behind the lock screen\n\nThe foreground activity is stopped when the device goes to sleep,\nand started again when the device is unlocked. We now distinguish\nthis case from a \"normal\" stop, and do not finish() a foreground\nnoHistory\u003d\"true\" activity inappropriately when the device sleeps.\nWe also detect the case where an activity is started while the\ndevice is still asleep, in which case the foreground noHistory\nactivity is cleaned up as part of bringing the new activity to\nthe foreground.\n\nBug 6657549\n\nChange-Id: I9c6a0830aed0e47e4207b62803b90067c8486112\n" }, { "commit": "8ce090d936efc65dd68ba9fc15f99e1029cf58f2", "tree": "17b41c0b52f2b7113dc90db058a8d9fa2b2940f2", "parents": [ "b6b2af3cd182141030d6ffa8540d99058978e2d8", "68a808bc702f03536bd0cf3e2556127e364119d6" ], "author": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Thu Jun 14 16:09:30 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 14 16:09:30 2012 -0700" }, "message": "am 68a808bc: Merge \"Show even fewer notifications in Setup.\" into jb-dev\n\n* commit \u002768a808bc702f03536bd0cf3e2556127e364119d6\u0027:\n Show even fewer notifications in Setup.\n" }, { "commit": "68a808bc702f03536bd0cf3e2556127e364119d6", "tree": "031ca2015247958d2ba2e13eba00f57d2880c579", "parents": [ "9add56546b1a5ddbf54f058f2ddb807a0ca02dff", "590d515d912396a0c293d78529ac0dbc224400bf" ], "author": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Thu Jun 14 16:07:45 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 14 16:07:45 2012 -0700" }, "message": "Merge \"Show even fewer notifications in Setup.\" into jb-dev" }, { "commit": "de90d67b2f3da4d931455df3c58d9c0f8ea3ffb5", "tree": "7f2d4761e37d9f69b305541b0dc407b077de68d3", "parents": [ "2e820417d6f06272b6408d8c015ac45f18677a06", "8b9c6d51d59898375089e9708325604c227812e0" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Jun 14 14:57:31 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 14 14:57:31 2012 -0700" }, "message": "am 8b9c6d51: Merge \"Expose apps when keyguard animating.\" into jb-dev\n\n* commit \u00278b9c6d51d59898375089e9708325604c227812e0\u0027:\n Expose apps when keyguard animating.\n" }, { "commit": "8b9c6d51d59898375089e9708325604c227812e0", "tree": "fc8b17e9c41a930ea51615c1d6220230c3735956", "parents": [ "a676cdab11ace948a054b5ca342727a3d0eb29b2", "f03e4c55fc5f8c50c58da03b7e8cfe29b4b0c644" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Jun 14 14:55:19 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 14 14:55:19 2012 -0700" }, "message": "Merge \"Expose apps when keyguard animating.\" into jb-dev" }, { "commit": "2e820417d6f06272b6408d8c015ac45f18677a06", "tree": "9584c1fd6a168dc0bf038d0c6200a40aaa154630", "parents": [ "06116b08dad51923672dde2d884baf0e0dc70d2e", "a676cdab11ace948a054b5ca342727a3d0eb29b2" ], "author": { "name": "Michael Jurka", "email": "mikejurka@google.com", "time": "Thu Jun 14 14:46:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 14 14:46:38 2012 -0700" }, "message": "am a676cdab: Merge \"Tweak recents launch app animation\" into jb-dev\n\n* commit \u0027a676cdab11ace948a054b5ca342727a3d0eb29b2\u0027:\n Tweak recents launch app animation\n" }, { "commit": "a676cdab11ace948a054b5ca342727a3d0eb29b2", "tree": "e93c1ce2ee48edc73b65992c39b0d69f486c2fa5", "parents": [ "a989b334fd097114ce1016ce1668597a213a441c", "b9a38c57fc47858eb16f4a8b7aa3d3dc9b98166c" ], "author": { "name": "Michael Jurka", "email": "mikejurka@google.com", "time": "Thu Jun 14 14:33:55 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 14 14:33:55 2012 -0700" }, "message": "Merge \"Tweak recents launch app animation\" into jb-dev" }, { "commit": "f03e4c55fc5f8c50c58da03b7e8cfe29b4b0c644", "tree": "b01a3e2653daa908ebe36605e063a371b16d7646", "parents": [ "97c11fe3255dca23dad241bf7025a88a7336f4a1" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Jun 14 14:11:27 2012 -0700" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Jun 14 14:11:27 2012 -0700" }, "message": "Expose apps when keyguard animating.\n\nContinuing in the trend of not hiding apps while the keyguard is\nanimating.\n\nFixes bug 6653600.\n\nChange-Id: I151315084a13dcec061d2d6edccd31e1133610f4\n" }, { "commit": "590d515d912396a0c293d78529ac0dbc224400bf", "tree": "2be832b79c60fc41276563144bef08b9b91ba9b3", "parents": [ "0a4cbc3267c12fb4f5831ea70286b0664f90891a" ], "author": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Thu Jun 14 16:10:13 2012 -0400" }, "committer": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Thu Jun 14 16:10:13 2012 -0400" }, "message": "Show even fewer notifications in Setup.\n\nRestricting to pkg\u003d\"android\" didn\u0027t filter out things like\nopen wifi networks, etc. So now we have a whitelist:\nnotifications must be sent the \"android\" pseudo-package,\n*and* they must have one of these \"kind\" tags:\n\n - android.system.imeswitcher (IME switcher, needed by SUW)\n - android.system.update (OTAs)\n\nNote that OTAs currently use a fullScreenIntent, so they\nbypass this logic anyway, but for consistency\u0027s sake we now\nallow OTA icons in the status bar explicitly.\n\nBug: 6645469\nChange-Id: Ib2e2f22d7a0817a1acaf8137ed4f3c7d3ddf8af5\n" }, { "commit": "b9a38c57fc47858eb16f4a8b7aa3d3dc9b98166c", "tree": "23954f688842d172aba5ecab9041a1bd66ad2d45", "parents": [ "d772c4878e2207795e92b26a462fd02bca7e3c2e" ], "author": { "name": "Michael Jurka", "email": "mikejurka@google.com", "time": "Thu Jun 14 11:57:50 2012 -0700" }, "committer": { "name": "Michael Jurka", "email": "mikejurka@google.com", "time": "Thu Jun 14 11:57:50 2012 -0700" }, "message": "Tweak recents launch app animation\n\n- Sometimes the black background would flash; changing\nanimation durations to make this much less likely\n- Fixing issue in Recents where we sometimes forgot\nto disable drawing caches on views after enabling them" }, { "commit": "0b0ca3c551378f99f2423032db89778c34dbd146", "tree": "d3c2f3819c0b5cddfaea1f99553ab79ff0bdb4ca", "parents": [ "c4d3a0d8df87ecb946e9824ed651f026f7a35555", "9b1767bbb451e96ae6b2216a7ea26aa4a937ad55" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Jun 14 11:05:18 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 14 11:05:18 2012 -0700" }, "message": "am 9b1767bb: Merge \"Active window not updated window not updated properly.\" into jb-dev\n\n* commit \u00279b1767bbb451e96ae6b2216a7ea26aa4a937ad55\u0027:\n Active window not updated window not updated properly.\n" } ], "next": "9b1767bbb451e96ae6b2216a7ea26aa4a937ad55" }