)]}' { "log": [ { "commit": "2c095f367779ef32130c72849936a2e3013c8492", "tree": "f22e11880dff84df547fb39441b171985668905d", "parents": [ "b6b193013d4641cbbf0170c98aebc5c3f6a2214b" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Mon Oct 04 14:13:40 2010 -0700" }, "committer": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Mon Oct 04 18:29:09 2010 -0700" }, "message": "Refinements to drag/drop\n\nThumbnail measurement \u0026 drawing has been moved out into a delegate\nclass called View.DragThumbnailBuilder. This consolidates the\nthumbnail-related code as well as ensuring that the drag initiator\ndoes not have to know a priori where to place the thumbnail relative\nto the touch point *before* the thumbnail measurement step, as was\npreviously the case.\n\nstartDrag() no longer needs to be told where the current touch point\nis at the time the drag is launched.\n\nDrag events are now dispatched only to VISIBLE views.\n\nDispatch shouldn\u0027t double-recycle events any more when the target\nwindow is local to the system process.\n\nChange-Id: I49419103765a0cad2e18ddfcdd6dacb94daf1ff1\n" }, { "commit": "b4152eda1da54fc25abd14cb3f61982332bbc8bc", "tree": "4671d0fa038873f37044ab88173755db6cc2439b", "parents": [ "1869ad04c9762d1d9911861af647870f3a09ada0", "dc565f4b3ae90c296d51658c98fd9f6b53cf2492" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Mon Oct 04 12:28:45 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 04 12:28:45 2010 -0700" }, "message": "Merge \"work around race condition which causes us to try to load the phone status bar on the tablet.\"" }, { "commit": "dc565f4b3ae90c296d51658c98fd9f6b53cf2492", "tree": "1f2f874fa7798d56de67669d09aaf55e89d65780", "parents": [ "94e461309b5f6ad0a66508aa1c33330ec9ae13db" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Mon Oct 04 15:27:22 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Mon Oct 04 15:27:22 2010 -0400" }, "message": "work around race condition which causes us to try to load the phone\nstatus bar on the tablet.\n\nChange-Id: Id5ad1192b4667622957fd0c48870ea22a480e0b5\n" }, { "commit": "1869ad04c9762d1d9911861af647870f3a09ada0", "tree": "f69f24f43e169d0159d6e161be3d58920097f395", "parents": [ "e1ccf7c953c22a3e96a9e7f9483901d84c8c5f4c", "4e183215bac239bbc039df361fed034a965030ec" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 04 12:05:00 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 12:05:00 2010 -0700" }, "message": "am 4e183215: am 1073e3fa: Merge \"Don\\\u0027t write settings multiple times when unmounting.\" into gingerbread\n\nMerge commit \u00274e183215bac239bbc039df361fed034a965030ec\u0027\n\n* commit \u00274e183215bac239bbc039df361fed034a965030ec\u0027:\n Don\u0027t write settings multiple times when unmounting.\n" }, { "commit": "4e183215bac239bbc039df361fed034a965030ec", "tree": "0342bdf5d94c8ec027a85fe9316ec46e4ab0f4b9", "parents": [ "fbd5a59da9a455bc1c54a80bd5b3afeb426a8e3d", "1073e3fa72a59af15ff4243b65a789ddb61bcded" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 04 12:01:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 12:01:08 2010 -0700" }, "message": "am 1073e3fa: Merge \"Don\\\u0027t write settings multiple times when unmounting.\" into gingerbread\n\nMerge commit \u00271073e3fa72a59af15ff4243b65a789ddb61bcded\u0027 into gingerbread-plus-aosp\n\n* commit \u00271073e3fa72a59af15ff4243b65a789ddb61bcded\u0027:\n Don\u0027t write settings multiple times when unmounting.\n" }, { "commit": "3aeee33c720fc87d97625b8040d155ca0ee88848", "tree": "054febcd86ed12f16ff94f311f10aa1b9ec855d2", "parents": [ "624380a14def6c2acdb473e09c36139acbcefbf9" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sat Oct 02 18:56:33 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sat Oct 02 19:06:18 2010 -0700" }, "message": "Don\u0027t write settings multiple times when unmounting.\n\nThe package manager would write its settings multiple times,\nonce for each app on the SD card, when unmounting external storage.\nThis was kind-of slow.\n\nChange-Id: Ic5ce12022a9ce26857d1db3071e316750b03f05a\n" }, { "commit": "0f5f2e4c27612e2cda231473aec0c06838ff3750", "tree": "e55ea53a7a492f40c19be493b6f063c8603e9b22", "parents": [ "2874c3dec4f9ffd59b2be3de62c1148534396828", "e11b76d3efb056edea301d53a354d0730adf3520" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 21:49:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 21:49:29 2010 -0700" }, "message": "am e11b76d3: am f6295b35: Merge \"Minor logging changes to input dispatcher to help with debugging.\" into gingerbread\n\nMerge commit \u0027e11b76d3efb056edea301d53a354d0730adf3520\u0027\n\n* commit \u0027e11b76d3efb056edea301d53a354d0730adf3520\u0027:\n Minor logging changes to input dispatcher to help with debugging.\n" }, { "commit": "e11b76d3efb056edea301d53a354d0730adf3520", "tree": "7f25a0eb45fad5895e9eb23b8c802f92151af232", "parents": [ "8788d140363ed921f49d366d67bd7164e63e54ae", "f6295b35db7a7c40d4fb1c981e231bebcf13e2ba" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 19:01:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 19:01:14 2010 -0700" }, "message": "am f6295b35: Merge \"Minor logging changes to input dispatcher to help with debugging.\" into gingerbread\n\nMerge commit \u0027f6295b35db7a7c40d4fb1c981e231bebcf13e2ba\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f6295b35db7a7c40d4fb1c981e231bebcf13e2ba\u0027:\n Minor logging changes to input dispatcher to help with debugging.\n" }, { "commit": "f2f487183052865d50c004a835360be1728b5a52", "tree": "98965f96bbec354c7b93de0b83a882b43bf86d2a", "parents": [ "0eaf3931a31c29f3a3883aab426b595c231c2a58" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 17:46:21 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 18:05:13 2010 -0700" }, "message": "Minor logging changes to input dispatcher to help with debugging.\n\nAdded dumpsys reporting to EventHub.\nMade the formatting a bit clearer.\nAdded \u0027Locked\u0027 suffix to some internal methods of EventHub.\n\nChange-Id: Ic449560bcce378f6361895d27c66854e9724abb0\n" }, { "commit": "efb8a3d6e058c8bc90bb9da6c58dde453f359851", "tree": "4c356bd35a137e560b1a563a9ceff6366d90ca9d", "parents": [ "82a1372070e75df1a0201b22e33514bbb0d7b5e5", "57fa3e8b4c94125ddb5be015dd7fbde4a458894f" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 17:08:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 17:08:34 2010 -0700" }, "message": "am 57fa3e8b: am 9e32a438: Merge \"Support haptic feedback for virtual keys defined in key layout.\" into gingerbread\n\nMerge commit \u002757fa3e8b4c94125ddb5be015dd7fbde4a458894f\u0027\n\n* commit \u002757fa3e8b4c94125ddb5be015dd7fbde4a458894f\u0027:\n Support haptic feedback for virtual keys defined in key layout.\n" }, { "commit": "edeb7a5a391ddec6df6d34ecb1f64ef2bb376dbb", "tree": "d57d8976a2fb625ff8f5f65e8619759a854646b2", "parents": [ "120e6be701833fd7cdc6bf063b17e1f88929a074", "7e40e67f73e0e9fa61a9601d82e8a207ffdca039" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 17:07:21 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 17:07:21 2010 -0700" }, "message": "am 7e40e67f: am d9e88d22: Merge \"Add \"none\" for vold and deprecate mkobb -c\" into gingerbread\n\nMerge commit \u00277e40e67f73e0e9fa61a9601d82e8a207ffdca039\u0027\n\n* commit \u00277e40e67f73e0e9fa61a9601d82e8a207ffdca039\u0027:\n Add \"none\" for vold and deprecate mkobb -c\n" }, { "commit": "27dec99148c9d1cddb99269b131d8220098dc79f", "tree": "cd56b327e79f7f73800516e1992f9729ce436c90", "parents": [ "6486196c303c525b041b380e853e1d2135180239", "4d28e8c5c69fe81849b1b450f9af38b053079d97" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 01 16:44:12 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 01 16:44:12 2010 -0700" }, "message": "resolved conflicts for merge of 4d28e8c5 to master\n\nChange-Id: I2449488a84e44b3fb5f820b50951b2b2bfa3bcbf\n" }, { "commit": "57fa3e8b4c94125ddb5be015dd7fbde4a458894f", "tree": "d5d40a016e04d93b5feccba38bbe33f4d08a5248", "parents": [ "a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4", "9e32a438fd87180692da55197972ecddb1a731d9" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 16:16:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 16:16:23 2010 -0700" }, "message": "am 9e32a438: Merge \"Support haptic feedback for virtual keys defined in key layout.\" into gingerbread\n\nMerge commit \u00279e32a438fd87180692da55197972ecddb1a731d9\u0027 into gingerbread-plus-aosp\n\n* commit \u00279e32a438fd87180692da55197972ecddb1a731d9\u0027:\n Support haptic feedback for virtual keys defined in key layout.\n" }, { "commit": "7e40e67f73e0e9fa61a9601d82e8a207ffdca039", "tree": "88b12a0c64fc835ade01d012a827c26e36c4b42b", "parents": [ "007d5b2cf6af32dfe96c0c04988d090b872afb01", "d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 15:11:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 15:11:22 2010 -0700" }, "message": "am d9e88d22: Merge \"Add \"none\" for vold and deprecate mkobb -c\" into gingerbread\n\nMerge commit \u0027d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486\u0027:\n Add \"none\" for vold and deprecate mkobb -c\n" }, { "commit": "0eaf3931a31c29f3a3883aab426b595c231c2a58", "tree": "e79493c39fd735a3ff237fa43a1633abd5ef9910", "parents": [ "10e2120bdd2d99e100db187d49ac6a8495c7f956" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 14:55:30 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 15:08:56 2010 -0700" }, "message": "Support haptic feedback for virtual keys defined in key layout.\n\nChange-Id: I83e4108a87332692e03791dc066206becbc7941f\n" }, { "commit": "d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486", "tree": "2351ffe01b2e05532dba0b68fc1a1ed7842faffb", "parents": [ "fd57416cc8c2a333f46cacad6de48a3b1547eac9", "12ffd9bf4c2cc9075ea7602b4932f823ba940f80" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 14:06:46 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 01 14:06:46 2010 -0700" }, "message": "Merge \"Add \"none\" for vold and deprecate mkobb -c\" into gingerbread" }, { "commit": "12ffd9bf4c2cc9075ea7602b4932f823ba940f80", "tree": "5799aa5df8bde6b1f641d704b8909d0549fd1784", "parents": [ "2942391801b79816c5eb77d7ac94c4a65f26af48" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 12:56:59 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 14:02:47 2010 -0700" }, "message": "Add \"none\" for vold and deprecate mkobb -c\n\nIf vold isn\u0027t told \"none\" for the key, it will try to mount it as an\nencrypted container.\n\nAlso remove the -c option from mkobb since it can be triggered by\nincluding a key as well.\n\nChange-Id: I40a8ff3f778bfda682312630e6687ecc14b51844\n" }, { "commit": "4d28e8c5c69fe81849b1b450f9af38b053079d97", "tree": "b534635f536eafcd96e2a219c364e26ba0815bdb", "parents": [ "e468a4bc74f1b241b3de09ea99251a419e40c6d3", "1fa69735d9e786da4b20c3ab3da3aa66f3cf8116" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 01 13:42:40 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 13:42:40 2010 -0700" }, "message": "am 1fa69735: Merge \"Fix issue #3037083: Problem report for Pinball\" into gingerbread\n\nMerge commit \u00271fa69735d9e786da4b20c3ab3da3aa66f3cf8116\u0027 into gingerbread-plus-aosp\n\n* commit \u00271fa69735d9e786da4b20c3ab3da3aa66f3cf8116\u0027:\n Fix issue #3037083: Problem report for Pinball\n" }, { "commit": "6493e64c2a3d5fa6adf0e6331a061d5bc67649fa", "tree": "999884329e9b71cf546147102f626ded35f12949", "parents": [ "2942391801b79816c5eb77d7ac94c4a65f26af48" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 01 13:06:30 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 01 13:06:30 2010 -0700" }, "message": "Fix issue #3037083: Problem report for Pinball\n\nThe app was toggling between hiding and showing the status bar, because\nthe dialog was large enough to fill the screen but didn\u0027t set to hide\nthe status bar.\n\nIt turns out that the code to determine the top fullscreen window is\nintrinsically unstable, since it relies on comparing a window\u0027s frame\nwith the screen, yet the window frame can change as a result of changes\nsuch as hiding the status bar.\n\nInstead, we now simplify all of this to just say that the top fillxfill\nwindow gets to control the status bar.\n\nChange-Id: I22913adf7235fe0d52612f6738c7c94351274e38\n" }, { "commit": "2a471bb690c20533ccf20246be968f77c867c467", "tree": "c5ea338d412566c0013aa7d3f0c7e7b3695caaae", "parents": [ "e15119fee611997e71dd711cd476c9fd572d9853", "38ed2e39c54a42dda8f00620f960788f569a3698" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Oct 01 12:15:12 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 01 12:15:12 2010 -0700" }, "message": "Merge \"refactored screenshot code\"" }, { "commit": "d1034c1967178302cad9085d15ae9849497babb2", "tree": "c9cb6ec3176427944433e168a58669e21c078d68", "parents": [ "babcb660760e7c85240e6bf43165c8c063d95715", "637a8d84bacd0b6973a16843259f0c11845f2cd2" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 09:07:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 09:07:34 2010 -0700" }, "message": "am 637a8d84: am 29423918: Fix regression in OBB key handling\n\nMerge commit \u0027637a8d84bacd0b6973a16843259f0c11845f2cd2\u0027\n\n* commit \u0027637a8d84bacd0b6973a16843259f0c11845f2cd2\u0027:\n Fix regression in OBB key handling\n" }, { "commit": "637a8d84bacd0b6973a16843259f0c11845f2cd2", "tree": "c3044774c9ea8c919fbd492266878eb109c6bb8a", "parents": [ "6a3eddb469b282f7d904e5dbcb375ad44ada3ee3", "2942391801b79816c5eb77d7ac94c4a65f26af48" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 08:55:53 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 08:55:53 2010 -0700" }, "message": "am 29423918: Fix regression in OBB key handling\n\nMerge commit \u00272942391801b79816c5eb77d7ac94c4a65f26af48\u0027 into gingerbread-plus-aosp\n\n* commit \u00272942391801b79816c5eb77d7ac94c4a65f26af48\u0027:\n Fix regression in OBB key handling\n" }, { "commit": "2942391801b79816c5eb77d7ac94c4a65f26af48", "tree": "377be8b9e3b763263056bac5565888a9f0b2cb92", "parents": [ "0a69f597604254bc37721b135ab612eaacdd0cbd" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 08:37:20 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 08:38:56 2010 -0700" }, "message": "Fix regression in OBB key handling\n\nChange-Id: If583cbdb8be68ffed094a5fde7ee00e1914c5841\n" }, { "commit": "dc71b9e4d67327065a992924a021cad4bc100fa2", "tree": "1a27c83ca574c7f0a14bc69b0e2d34edaa13aeb8", "parents": [ "557ed7aa290497fb5764acb3f577edbe78bad5b9", "6a3eddb469b282f7d904e5dbcb375ad44ada3ee3" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 30 20:34:34 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 30 20:34:34 2010 -0700" }, "message": "resolved conflicts for merge of 6a3eddb4 to master\n\nChange-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e\n" }, { "commit": "557ed7aa290497fb5764acb3f577edbe78bad5b9", "tree": "7ed16abd4b23f6f29d27e64c86c43e2a91e48744", "parents": [ "9664b24172188765653812b4eda03223c32272eb", "0457db37de22d430df0e55a7552dcfe81b701627" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 30 19:48:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 19:48:31 2010 -0700" }, "message": "am 0457db37: am ab2e6284: Merge \"Use the private version of userActivity.\" into gingerbread\n\nMerge commit \u00270457db37de22d430df0e55a7552dcfe81b701627\u0027\n\n* commit \u00270457db37de22d430df0e55a7552dcfe81b701627\u0027:\n Use the private version of userActivity.\n" }, { "commit": "9664b24172188765653812b4eda03223c32272eb", "tree": "eae1074a05eb46481dba12529ee8dae083097243", "parents": [ "82fb4ef335ec63a519a0658cea233ed8a3265020", "8d85beca80f0c84344ffb527ec7cab0ca7b53d4f" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 19:48:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 19:48:27 2010 -0700" }, "message": "am 8d85beca: am 8b28441a: Merge \"Being already unmounted is not a failure\" into gingerbread\n\nMerge commit \u00278d85beca80f0c84344ffb527ec7cab0ca7b53d4f\u0027\n\n* commit \u00278d85beca80f0c84344ffb527ec7cab0ca7b53d4f\u0027:\n Being already unmounted is not a failure\n" }, { "commit": "785c416ecf627a550c15f33800fe3091482b181a", "tree": "6224c4606fb35430cd96bf433b173ca1ae4a9c1b", "parents": [ "13cc0a06fce4ec54574c9bf2084752961a144c24", "de12c3cf56e3f27b2efc60eeae8b5e422747f2b9" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 30 19:47:21 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 19:47:21 2010 -0700" }, "message": "am de12c3cf: am 220ab887: Merge \"Issue 3032913: improve AudioTrack recovery time\" into gingerbread\n\nMerge commit \u0027de12c3cf56e3f27b2efc60eeae8b5e422747f2b9\u0027\n\n* commit \u0027de12c3cf56e3f27b2efc60eeae8b5e422747f2b9\u0027:\n Issue 3032913: improve AudioTrack recovery time\n" }, { "commit": "13cc0a06fce4ec54574c9bf2084752961a144c24", "tree": "77af62b768870dc45b26c56978f70332fad66d94", "parents": [ "fc32a6023676c2f1b13c890c7295cccad6f0000c", "4309b52fe19de5241113d8f9ebcdf52741e086a9" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 19:47:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 19:47:06 2010 -0700" }, "message": "am 4309b52f: am 735de3b3: Hash keys with MD5; track IBinders not IInterface\n\nMerge commit \u00274309b52fe19de5241113d8f9ebcdf52741e086a9\u0027\n\n* commit \u00274309b52fe19de5241113d8f9ebcdf52741e086a9\u0027:\n Hash keys with MD5; track IBinders not IInterface\n" }, { "commit": "fc32a6023676c2f1b13c890c7295cccad6f0000c", "tree": "604c67c12fdfa067a9709fcac1eabe025fb03785", "parents": [ "9e95468bbb4b4cb48d817cee2960681aa876b12a", "0f064de830d11ddb08a3c000b894b46aa530348a" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 19:47:00 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 19:47:00 2010 -0700" }, "message": "am 0f064de8: am 27358a69: Only allow 8 OBBs to be mounted by a UID\n\nMerge commit \u00270f064de830d11ddb08a3c000b894b46aa530348a\u0027\n\n* commit \u00270f064de830d11ddb08a3c000b894b46aa530348a\u0027:\n Only allow 8 OBBs to be mounted by a UID\n" }, { "commit": "9e95468bbb4b4cb48d817cee2960681aa876b12a", "tree": "5ffd0bd5fd680ab72d34cb05f1244edc5598fbb3", "parents": [ "1041bb7eec5163781442624fdc2fef42b41f7c54", "6ce5f60c791401ed0faf5d36baf4fc6612358676" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 19:46:46 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 19:46:46 2010 -0700" }, "message": "am 6ce5f60c: am 38cf8867: Remove OBBs from state list when volume unmounted\n\nMerge commit \u00276ce5f60c791401ed0faf5d36baf4fc6612358676\u0027\n\n* commit \u00276ce5f60c791401ed0faf5d36baf4fc6612358676\u0027:\n Remove OBBs from state list when volume unmounted\n" }, { "commit": "6a3eddb469b282f7d904e5dbcb375ad44ada3ee3", "tree": "6f936ed432e0d3797992573cb6e72875c5a2bba8", "parents": [ "0457db37de22d430df0e55a7552dcfe81b701627", "0a69f597604254bc37721b135ab612eaacdd0cbd" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 30 19:12:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 19:12:11 2010 -0700" }, "message": "am 0a69f597: Merge \"Rub in a little \\\u0027ol log-b-gone.\" into gingerbread\n\nMerge commit \u00270a69f597604254bc37721b135ab612eaacdd0cbd\u0027 into gingerbread-plus-aosp\n\n* commit \u00270a69f597604254bc37721b135ab612eaacdd0cbd\u0027:\n Rub in a little \u0027ol log-b-gone.\n" }, { "commit": "0a69f597604254bc37721b135ab612eaacdd0cbd", "tree": "0f78376b5a3edaba3c6bc0218127f9c36acc89bf", "parents": [ "ab2e6284845794079d809e62c52c6c380b31c4b5", "cef65eeb0315c3118bf8860d6f723cb49ff6bc52" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 30 19:03:38 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 30 19:03:38 2010 -0700" }, "message": "Merge \"Rub in a little \u0027ol log-b-gone.\" into gingerbread" }, { "commit": "cef65eeb0315c3118bf8860d6f723cb49ff6bc52", "tree": "2917e5a149a267eac00b13a27a88627e252cfe23", "parents": [ "727d67d4fb8721b0291312e4cca33927dfba0e31" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 30 18:27:22 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 30 18:27:22 2010 -0700" }, "message": "Rub in a little \u0027ol log-b-gone.\n\nMmmmmm... great fresh scent!\n\nChange-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d\n" }, { "commit": "0457db37de22d430df0e55a7552dcfe81b701627", "tree": "fefbefdecbf31fc44c30ccd266da970b16f0c363", "parents": [ "8d85beca80f0c84344ffb527ec7cab0ca7b53d4f", "ab2e6284845794079d809e62c52c6c380b31c4b5" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 30 18:19:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 18:19:09 2010 -0700" }, "message": "am ab2e6284: Merge \"Use the private version of userActivity.\" into gingerbread\n\nMerge commit \u0027ab2e6284845794079d809e62c52c6c380b31c4b5\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ab2e6284845794079d809e62c52c6c380b31c4b5\u0027:\n Use the private version of userActivity.\n" }, { "commit": "ab2e6284845794079d809e62c52c6c380b31c4b5", "tree": "067c52d45d3d060d8c012be7c88bf09977e07147", "parents": [ "8b28441adab59f2bb0d92c8a717af75331249e08", "a39ccb6c4ae7dbf522a3fd0c450a95653c6418ea" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 30 18:12:24 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 30 18:12:24 2010 -0700" }, "message": "Merge \"Use the private version of userActivity.\" into gingerbread" }, { "commit": "8d85beca80f0c84344ffb527ec7cab0ca7b53d4f", "tree": "4359f2718e67adce2c97057e9714545c8b3f64ed", "parents": [ "c38e6ae40096ec60bc42de663f39dc061b9c90f4", "8b28441adab59f2bb0d92c8a717af75331249e08" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 18:06:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 18:06:02 2010 -0700" }, "message": "am 8b28441a: Merge \"Being already unmounted is not a failure\" into gingerbread\n\nMerge commit \u00278b28441adab59f2bb0d92c8a717af75331249e08\u0027 into gingerbread-plus-aosp\n\n* commit \u00278b28441adab59f2bb0d92c8a717af75331249e08\u0027:\n Being already unmounted is not a failure\n" }, { "commit": "8b28441adab59f2bb0d92c8a717af75331249e08", "tree": "f14862c9435a0c7b6f9ab5df7fbc0199ed62589d", "parents": [ "274e3b5d752d1a4fd05352e50ad098d2f5b49a36", "4da02392a12e26f94a072e0a8584dbebfa29c4e3" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 18:03:25 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 30 18:03:25 2010 -0700" }, "message": "Merge \"Being already unmounted is not a failure\" into gingerbread" }, { "commit": "4da02392a12e26f94a072e0a8584dbebfa29c4e3", "tree": "b2b4a218ae56422f56982d3ee99f7aebd29c9d22", "parents": [ "735de3b38abbd6564082a819377673ee593744a6" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 17:58:41 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 17:59:42 2010 -0700" }, "message": "Being already unmounted is not a failure\n\nChange-Id: I5943096444e3d4d4cc5fd63f64a09c32f649a227\n" }, { "commit": "de12c3cf56e3f27b2efc60eeae8b5e422747f2b9", "tree": "cbfc1763688551dc77514f7f6e4d8f07d10b1e7d", "parents": [ "4309b52fe19de5241113d8f9ebcdf52741e086a9", "220ab8877b234e6807b7f6d9028ba55d23220301" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 30 17:47:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 17:47:07 2010 -0700" }, "message": "am 220ab887: Merge \"Issue 3032913: improve AudioTrack recovery time\" into gingerbread\n\nMerge commit \u0027220ab8877b234e6807b7f6d9028ba55d23220301\u0027 into gingerbread-plus-aosp\n\n* commit \u0027220ab8877b234e6807b7f6d9028ba55d23220301\u0027:\n Issue 3032913: improve AudioTrack recovery time\n" }, { "commit": "220ab8877b234e6807b7f6d9028ba55d23220301", "tree": "f56335a13247aa16d5e65974b56de237b62c3dea", "parents": [ "735de3b38abbd6564082a819377673ee593744a6", "4712baab81d0b683bc22668d2278c9daff92797e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 30 17:39:36 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 30 17:39:36 2010 -0700" }, "message": "Merge \"Issue 3032913: improve AudioTrack recovery time\" into gingerbread" }, { "commit": "4309b52fe19de5241113d8f9ebcdf52741e086a9", "tree": "cd5746570a1a7ce256a27babfddc7c24d7c1402a", "parents": [ "0f064de830d11ddb08a3c000b894b46aa530348a", "735de3b38abbd6564082a819377673ee593744a6" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 17:30:37 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 17:30:37 2010 -0700" }, "message": "am 735de3b3: Hash keys with MD5; track IBinders not IInterface\n\nMerge commit \u0027735de3b38abbd6564082a819377673ee593744a6\u0027 into gingerbread-plus-aosp\n\n* commit \u0027735de3b38abbd6564082a819377673ee593744a6\u0027:\n Hash keys with MD5; track IBinders not IInterface\n" }, { "commit": "0f064de830d11ddb08a3c000b894b46aa530348a", "tree": "9b7b3b59f746489663ae392b2233d69320e0119a", "parents": [ "6ce5f60c791401ed0faf5d36baf4fc6612358676", "27358a69b33eaa268ee75ef778ec824c8085adcc" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 17:30:33 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 17:30:33 2010 -0700" }, "message": "am 27358a69: Only allow 8 OBBs to be mounted by a UID\n\nMerge commit \u002727358a69b33eaa268ee75ef778ec824c8085adcc\u0027 into gingerbread-plus-aosp\n\n* commit \u002727358a69b33eaa268ee75ef778ec824c8085adcc\u0027:\n Only allow 8 OBBs to be mounted by a UID\n" }, { "commit": "6ce5f60c791401ed0faf5d36baf4fc6612358676", "tree": "d49732b6d288f5f9a7ad6f5a37b82a0fa66d7653", "parents": [ "9af6b53676061db6fc9c18300dc7d8258f7306ab", "38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 17:30:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 17:30:22 2010 -0700" }, "message": "am 38cf8867: Remove OBBs from state list when volume unmounted\n\nMerge commit \u002738cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94\u0027 into gingerbread-plus-aosp\n\n* commit \u002738cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94\u0027:\n Remove OBBs from state list when volume unmounted\n" }, { "commit": "735de3b38abbd6564082a819377673ee593744a6", "tree": "ec309587616c5abbc49df83d7d21b6a3b3e9dfbd", "parents": [ "27358a69b33eaa268ee75ef778ec824c8085adcc" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 14:11:39 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 17:25:05 2010 -0700" }, "message": "Hash keys with MD5; track IBinders not IInterface\n\nUsing a plaintext password doesn\u0027t work unless it\u0027s a certain length, so\njust hash the plaintext password with MD5 to make it the right length\nfor the twofish encryption.\n\nTracking the IInterface doesn\u0027t make much sense since it\u0027s different\neach time, so track the IBinder instead. That way we can unlinkToDeath\nthe binder when the last thing it\u0027s holding onto goes away.\n\nChange-Id: Id828d25b4d74f27e9d8b4bfb3909c964469cc473\n" }, { "commit": "27358a69b33eaa268ee75ef778ec824c8085adcc", "tree": "e12147b6763048166c954c0d2375b9daaecd9abc", "parents": [ "38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 29 19:27:20 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 17:24:53 2010 -0700" }, "message": "Only allow 8 OBBs to be mounted by a UID\n\nChange-Id: I4f017c5408af903c6c9ba007a2cf7f488a7fcd27\n" }, { "commit": "38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94", "tree": "84b4d47ada068bda31db1b024781e6a5bfb7a585", "parents": [ "063d02bb03a9260314b529490866528433148738" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Sun Sep 26 14:18:51 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 17:24:34 2010 -0700" }, "message": "Remove OBBs from state list when volume unmounted\n\nDon\u0027t keep tracking OBBs when the volume they\u0027re located on goes away.\nRemove them from our state tracking maps and then send a notification to\nany listener that is still around.\n\nAdd a dump handler to MountService so the state of the mount lists\ncan be inspected.\n\nChange the API to just make a callback directly to the change listener\nwhen mount is called when it\u0027s already mounted or unmount called when\nit\u0027s already unmounted.\n\nChange-Id: Idb4afbb943ca5ca775825f908bff334e3ce1cfcc\n" }, { "commit": "4712baab81d0b683bc22668d2278c9daff92797e", "tree": "e2af5c484425ede13606e62569ad615b184d2d8f", "parents": [ "0a972acf85ce0cf7bba5a77628e9cf59a0946bd0" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 30 16:12:31 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 30 17:21:23 2010 -0700" }, "message": "Issue 3032913: improve AudioTrack recovery time\n\nThis issue showed that when an AudioTrack underruns during a too long period\nof time and is therefore disabled by audioflinger mixer, it takes an additional\ndelay of up to 3 seconds to recover.\nThis fix adds a simple mechanism to recover immediately when the client application\nis ready to write data again in the AudioTrack buffer\n\nAlso throttle warnings on record overflows\n\nChange-Id: I8b2c71578dd134b9e60a15ee4d91b70f3799cb3d\n" }, { "commit": "1a74cc347add7ad213378ff1b3abc848bd3dd185", "tree": "1326dc6af321872550373f27132aa3582fda4c1b", "parents": [ "be0488db81f6e156c25899cd1001e4d50a513df3", "a53146c5569f8ff5f7eb55e9ad35d23ddacf2add" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Sep 30 17:04:31 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 30 17:04:31 2010 -0700" }, "message": "Merge \"Drag/drop APIs and infrastructure\"" }, { "commit": "a39ccb6c4ae7dbf522a3fd0c450a95653c6418ea", "tree": "28b0feeebb1fb9d02aa0058f238995f9feaa5e63", "parents": [ "4ba2817c869d4ec6b518a57ea32cc3765b18b0db" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 30 16:40:31 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 30 16:47:09 2010 -0700" }, "message": "Use the private version of userActivity.\n\nWe were flunking the enforcement of DEVICE_POWER since apps don\u0027t need that permission to use a wake\nlock.\n\nBug: 3051596\nChange-Id: I1910d8402adb3e9a4d8635de5d2a301f6286f216\n" }, { "commit": "a53146c5569f8ff5f7eb55e9ad35d23ddacf2add", "tree": "2e29a19de07b5b6c721221b72a82392ff7452d8b", "parents": [ "07b88ea0acd44ecd317ce37eb4338e5b0d2b52b0" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Sep 07 11:57:52 2010 -0700" }, "committer": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Sep 30 16:29:07 2010 -0700" }, "message": "Drag/drop APIs and infrastructure\n\nA View initiates a drag-and-drop operation (hereafter just called a \"drag\")\nby calling its startDrag(ClipData) method. Within the processing of that\ncall, two callbacks are made into the originating View. The first is to\nonMeasureDragThumbnail(). Similarly to the core onMeasure() method, this\ncallback must respond by calling setDragThumbnailDimension(width, height) to\ndeclare the size of the drag thumbnail image that should be used. Following\nthis, the View\u0027s onDrawDragThumbnail(canvas) method will be invoked to\nactually produce the bits of the thumbnail image.\n\nIf all goes well, startDrag() will return \u0027true\u0027, and the drag is off and\nrunning. (The other arguments to startDrag() provide reconciliation between\nthe current finger position and where the thumbnail should be placed on\nthe screen relative to it.)\n\nPotential receipients of the ClipData behind the drag are notified by a\nnew dispatch mechanism, roughly parallel to motion event dispatch. The core\nroutine is the View\u0027s onDragEvent(event) callback, with the mechanics of\ndispatch itself being routed through dispatchDragEvent(event) -- as in\nthe case of motion events, the dispatch logic is in ViewGroup, with leaf\nView objects not needing to consider the dispatch flow.\n\nSeveral different event \u0027actions\u0027 are delivered through this dispatch\nmechanism:\n\nACTION_DRAG_STARTED: this event is propagated to every View in every window\n(including windows created during the course of a drag). It serves as a\nglobal notification that a drag has started with a payload whose matching\nClipDescription is supplied with the event. A View that is prepared to\nconsume the data described in this event should return \u0027true\u0027 from their\nonDragEvent() method, and ideally will also make some visible on-screen\nindication that they are a potential target of the drop.\n\nACTION_DRAG_ENTERED: this event is sent once when the drag point\nenters the View\u0027s bounds. It is an opportunity for the View to set up\nfeedback that they are the one who will see the drop if the finger goes\nup now.\n\nACTION_DRAG_LOCATION: when the drag point is over a given View, that\nView will receive a stream of DRAG_LOCATION events, providing an\nopportunity for the View to show visual feedback tied to the drag point.\n\nACTION_DRAG_EXITED: like DRAG_ENTERED, but called when the drag point\nleaves the View\u0027s bounds. The View should undo any visuals meant to\nemphasize their being the hovered-over target.\n\nACTION_DROP: when the drag ends at a given point, the View under that\npoint is sent this event, with the full ClipData of the payload.\n\nACTION_DRAG_ENDED: paralleling the DRAG_STARTED action, this is the global\nbroadcast that the drag has ended and all Views should return to their\nnormal visual state. This happens after the DROP event.\n\nChange-Id: Ia8d0fb1516bce8c735d87ffd101af0976d7e84b6\n" }, { "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": "38ed2e39c54a42dda8f00620f960788f569a3698", "tree": "bf7d48a3bb3c372e7348cab154cb73301ce4a87f", "parents": [ "e17c054d34676c25f03b4eb0d8daebe41b84bf6e" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Sep 29 13:02:36 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Sep 29 16:55:15 2010 -0700" }, "message": "refactored screenshot code\n\nthe core screenshot function now can capture the screen at any lower resolution\nperforming bilinear filtering.\n\nwe also now have some client code to interface with the screenshot service.\n\nit\u0027s now possible to request a screenshot at a lower resolution.\n\nChange-Id: I5a3b0e431421800e3aad601d9af8f94adffbc71f\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": "c9a9800fa1572c3a25831bdf22f7b4579fd8bd10", "tree": "17fd6d0b274eda84741595e6b6a3be7ae773ba5c", "parents": [ "1e57996f47e9d7f96506e2d680eea9f1d7ecc7ac", "b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 28 17:39:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 17:39:54 2010 -0700" }, "message": "am b047e3cd: am aeb2c62e: Merge \"Fix several audio effects problems.\" into gingerbread\n\nMerge commit \u0027b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c\u0027\n\n* commit \u0027b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c\u0027:\n Fix several audio effects problems.\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": "ea2cf2f936b03f1720bc43863e41c89ea2a7903a", "tree": "7e11d825315f5e3a045163a528ccd800bde922c1", "parents": [ "f2f34505a1267955b5533ee04f803b1bcd83140a", "059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Tue Sep 28 17:19:37 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 28 17:19:37 2010 -0700" }, "message": "Merge \"Check for the DEVICE_POWER permission in userActivity.\" into gingerbread" }, { "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": "b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c", "tree": "00a3cfa84210a7b6ba04c73aca143d911873c71f", "parents": [ "0e8dc464bdfa29785aab7be6343154fee361f6a0", "aeb2c62e7669f004512c42ad8572d1fdd2c25f68" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 28 16:42:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 16:42:14 2010 -0700" }, "message": "am aeb2c62e: Merge \"Fix several audio effects problems.\" into gingerbread\n\nMerge commit \u0027aeb2c62e7669f004512c42ad8572d1fdd2c25f68\u0027 into gingerbread-plus-aosp\n\n* commit \u0027aeb2c62e7669f004512c42ad8572d1fdd2c25f68\u0027:\n Fix several audio effects problems.\n" }, { "commit": "4fd3ecc1f0b8d95f52b516cd81fe4f06607d5cb0", "tree": "f01db4d9eb88b7ecf512f39d05a65fc0eb4275fc", "parents": [ "65a5ba45559e88a50c258d794a1728498c248376" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 28 14:09:57 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 28 14:23:39 2010 -0700" }, "message": "Fix several audio effects problems.\n\nFixed the following issues in LVM effect bundle wrapper:\n- memory leaks in EffectCreate() in case effect creation fails at various stages\n- Added saturation when accumulating to output buffer\n- Fixed problems with enabled effects count when an effect is released while enabled\n- Do not allocate temporary buffer for accumulation each time process() is called\n\nFixed the following issues in effects framework (AudioFlinger)\n- Release effect synchronously in the library when deleted from effect chain\n- Do not call the effect process function if no tracks are present in the same\naudio session\n\nChange-Id: Ifbd80a163415cfb3c0a337c12082853ea45d9c91\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": "de8652cbc120d2d79ec321bc54506fc5577e7928", "tree": "28d86a677b683e3fdf5c77ce99ed541edfa522c7", "parents": [ "cc8f44bc819a76ac8d0127c57a303bd839240a62", "191a25e1da9a9b746b76bde23b5d458c172d8e09" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Mon Sep 27 20:50:22 2010 -0700" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Mon Sep 27 20:50:22 2010 -0700" }, "message": "resolved conflicts for merge of 191a25e1 to master\n\nChange-Id: I6f4940e337a992bf84e50bc1d22432593937499c\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": "464fb74e28b6d76d5e741abcdbb714eea2d9b4d1", "tree": "806828fef18870b8c0a5cde7a6e679dce8b5a122", "parents": [ "6d3ed72bf2fb9d958245c9d34443291a26128c59", "9785bf0f2b6b8758aed7ded3b996a2ef0be89919" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Sep 27 14:40:38 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 14:40:38 2010 -0700" }, "message": "am 9785bf0f: am 14a288da: Merge \"Add suuport for splitting touch events across windows.\" into gingerbread\n\nMerge commit \u00279785bf0f2b6b8758aed7ded3b996a2ef0be89919\u0027\n\n* commit \u00279785bf0f2b6b8758aed7ded3b996a2ef0be89919\u0027:\n Add suuport for splitting touch events across windows.\n" } ], "next": "7e54ef71db3320a751571bba5259fba816399421" }