)]}' { "log": [ { "commit": "4ce46793091bf073e93fce72d4a9d3ed1d5201d1", "tree": "58be9bc47cbb398718a0a85bfbba4a554b08da90", "parents": [ "804574644849ef39d63d6515497469ee3b33b1d8" ], "author": { "name": "Dario Freni", "email": "dariofreni@google.com", "time": "Fri Jun 01 14:02:08 2018 +0100" }, "committer": { "name": "Dario Freni", "email": "dariofreni@google.com", "time": "Fri Aug 17 16:34:18 2018 +0000" }, "message": "androidfw changes to support /product-services.\n\nSee CL I7a6a30bf8e8db9f2738594d187bb9148f138b8da for a more detailed\ndescription of the change.\n\nTest: see CL I7a6a30bf8e8db9f2738594d187bb9148f138b8da description\nBug: 80741439\nChange-Id: I6cc9d713c07c319fc2ee1c531af41243bd1d4aee\n" }, { "commit": "804574644849ef39d63d6515497469ee3b33b1d8", "tree": "57cbce980ddb7d9ee2b594efe02f8354469542ce", "parents": [ "6e354f0a2c927e4d58d8233276c0d57a33f4a58c", "faa102f723c1c0416ec111911610d9461b18f187" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Fri Aug 17 14:29:02 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 14:29:02 2018 +0000" }, "message": "Merge \"ScreenDecorations: Fix stuck / delayed rotations (second try)\"" }, { "commit": "6e354f0a2c927e4d58d8233276c0d57a33f4a58c", "tree": "45298df59162692e1ad743901e2a8cea4f118470", "parents": [ "9cbee64d26516bb8f196c1700ceda19416243536", "e481d33cc0f02ff63d337304b9d4e3bddf42179a" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 14:09:07 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 14:09:07 2018 +0000" }, "message": "Merge \"Parcel mCharacters in KeyEvent\"" }, { "commit": "9cbee64d26516bb8f196c1700ceda19416243536", "tree": "aea6efe7bbb6e232d0b677cf0080ec187919c1af", "parents": [ "80a2b7091f2975741cda9f5755929cba1febcd10", "bc95621811b0c15904a4783aae34e94aa109f764" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 13:17:30 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 13:17:30 2018 +0000" }, "message": "Merge \"ResourceManager: Disable APK Assets cache.\"" }, { "commit": "80a2b7091f2975741cda9f5755929cba1febcd10", "tree": "576cb74950824cfef5ac3d6e331518ac0de31e9f", "parents": [ "64094484fde48a52accb99e7b2dded6d306fd541", "2f43b64a4afc602b43d1beaffc256a442badfe52" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 13:17:01 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 13:17:01 2018 +0000" }, "message": "Merge \"Ensure zen SystemConditions are subscribed\"" }, { "commit": "64094484fde48a52accb99e7b2dded6d306fd541", "tree": "63d92753dfa9e51ab24a2eb810bd7f7399c5bc68", "parents": [ "f4aea74d87884aa694c6b4962dbe643b11ecbe88", "fcefd69c5bc2629c43b53b59a1a8a171f69b89ef" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 11:40:25 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 11:40:25 2018 +0000" }, "message": "Merge \"Docs: fixed formatting for setLaunchBounds()\"" }, { "commit": "f4aea74d87884aa694c6b4962dbe643b11ecbe88", "tree": "05d140475dc38baf6f22bc2ec5843081a78d045d", "parents": [ "7d14ca89123c61135256416cf5d1da01112b7fc2", "f24779c8c7a3f647f65944e02425b751e580b393" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 11:14:08 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 11:14:08 2018 +0000" }, "message": "Merge \"Build android.test.* with java_sdk_library\"" }, { "commit": "bc95621811b0c15904a4783aae34e94aa109f764", "tree": "d6a29b391abed451ec7bfffcbab7119bd2f3bc2e", "parents": [ "f989a15ed89774ec40ec2562541806212a70e526" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Aug 13 12:53:38 2018 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Aug 17 11:50:29 2018 +0100" }, "message": "ResourceManager: Disable APK Assets cache.\n\nThe WeakReference based cache of Assets in use elsewhere in the\nprocess remains unchanged.\n\nNote that this change is larger than it needs to be because it is\nan error to create an LruCache of size zero.\n\nThere seems to be no measurable difference as measured by the standard\napp startup benchmarks.\n\nTest: atest -v google/perf/app-startup/benchmark-app-hermetic/cold-dropcache-test\nBug: 111385832\nChange-Id: I432c069e90124e884bddc5cd5be43a28e1b16d07\n" }, { "commit": "7d14ca89123c61135256416cf5d1da01112b7fc2", "tree": "66abb19898c1d4c86026c68bbb71c6667e7af297", "parents": [ "94763e192fe35f84db6e3ecefb31cae0b5f13f4f", "29779732e63c894afc0ec0339af1d20cc761f9a4" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 03:24:26 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 03:24:26 2018 -0700" }, "message": "[automerger skipped] Merge \"Add @UnsupportedAppUsage annotations\" am: d9381f5e56 am: e2a6ad99ae\nam: 29779732e6 -s ours\n\nChange-Id: Ib552ea746445cab85d956d48a1a00309d910dcd3\n" }, { "commit": "29779732e63c894afc0ec0339af1d20cc761f9a4", "tree": "60e8e49fbde30c0fa98bd29addef93dc2e45ae8d", "parents": [ "559898ef333563d929d36a503211c3cae3a37a1a", "e2a6ad99ae03deb36271f76dd506e42b5af780bf" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 03:16:13 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 03:16:13 2018 -0700" }, "message": "Merge \"Add @UnsupportedAppUsage annotations\" am: d9381f5e56\nam: e2a6ad99ae\n\nChange-Id: I3a0236e8388f7f5448a10873a3e0f0ca502fa625\n" }, { "commit": "94763e192fe35f84db6e3ecefb31cae0b5f13f4f", "tree": "66abb19898c1d4c86026c68bbb71c6667e7af297", "parents": [ "ac260b03c1f122357e4cb6d4c3f47e2a824ca13b", "559898ef333563d929d36a503211c3cae3a37a1a" ], "author": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Fri Aug 17 02:23:37 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 02:23:37 2018 -0700" }, "message": "Merge \"Use 28.txt as API file for migrating NULLs in Metalava\" am: 2495ca3c29 am: 7aa98ce2b0\nam: 559898ef33\n\nChange-Id: Id51b64c8afea2a19e3fe2ad2363fd6b234c35825\n" }, { "commit": "ac260b03c1f122357e4cb6d4c3f47e2a824ca13b", "tree": "9820275c1273d0af5acdd7e965136feb781912ed", "parents": [ "2fb271cb29ae03503ed4dccb883d69de2f4541ff", "6e9c16f89e0f0534252142c58711429eb31076c6" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri Aug 17 02:15:34 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 02:15:34 2018 -0700" }, "message": "[automerger skipped] Merge \"Fix testRegisterUsageCallback failure in setUp\" am: c68f5313a2 am: a788c6816b\nam: 6e9c16f89e -s ours\n\nChange-Id: I6ac57830e6c5669f24d7b2195632f578e2c7fb84\n" }, { "commit": "e2a6ad99ae03deb36271f76dd506e42b5af780bf", "tree": "4b188212428c5dc261851fe48db305eab88dea59", "parents": [ "7aa98ce2b05cda26b0843531ca77991a7ba0ae88", "d9381f5e56f5d9b7ce10c72c50795dcb1c38a8a2" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 02:13:11 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 02:13:11 2018 -0700" }, "message": "Merge \"Add @UnsupportedAppUsage annotations\"\nam: d9381f5e56\n\nChange-Id: I3940d669bb1f4fedc8a7fbbcdb8de2ef954674a8\n" }, { "commit": "2fb271cb29ae03503ed4dccb883d69de2f4541ff", "tree": "9820275c1273d0af5acdd7e965136feb781912ed", "parents": [ "6e5dc47e03b126a3371b837bfaee6336f3022ee5", "640fa1526dbc677905dae6d13510f1b9bb423dad" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 02:08:49 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 02:08:49 2018 -0700" }, "message": "Merge \"Code reformatting for upcoming automated code changes.\" am: d68f003c67 am: d48ec695d3\nam: 640fa1526d\n\nChange-Id: Idc4ce525b14a29f6ed87850f6df9577bdd05f38e\n" }, { "commit": "559898ef333563d929d36a503211c3cae3a37a1a", "tree": "6eeb49fca90437ca9e62e500906089f15c0adc6f", "parents": [ "6e9c16f89e0f0534252142c58711429eb31076c6", "7aa98ce2b05cda26b0843531ca77991a7ba0ae88" ], "author": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Fri Aug 17 02:07:15 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 02:07:15 2018 -0700" }, "message": "Merge \"Use 28.txt as API file for migrating NULLs in Metalava\" am: 2495ca3c29\nam: 7aa98ce2b0\n\nChange-Id: I8f7f9df6d0aa553e722912e05639b252a6c657bf\n" }, { "commit": "6e9c16f89e0f0534252142c58711429eb31076c6", "tree": "e562c345d9bfbea3608a8b603fb8fe2770ab73bf", "parents": [ "640fa1526dbc677905dae6d13510f1b9bb423dad", "a788c6816bc159187e45332b255d26be27e35f9a" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri Aug 17 02:02:08 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 02:02:08 2018 -0700" }, "message": "Merge \"Fix testRegisterUsageCallback failure in setUp\" am: c68f5313a2\nam: a788c6816b\n\nChange-Id: I5723e356d1b6aa1a71ba693598a5796900fd9ddc\n" }, { "commit": "6e5dc47e03b126a3371b837bfaee6336f3022ee5", "tree": "b9e4378eba512b16965489aed7e6334d1b31dc2f", "parents": [ "73ab8fcad1ec286d2ef959e93cf75d9992b9ad6e", "220c0a434a0d3677d798e1742474ae6801b69175" ], "author": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Fri Aug 17 01:59:23 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 01:59:23 2018 -0700" }, "message": "[automerger skipped] Merge \"Resolve NPE and unexpected error code in AccountManagerServiceTest\" am: 6078bc1602 am: 47ea1e53f3\nam: 220c0a434a -s ours\n\nChange-Id: Idc4558dbc4ad56570ea9769c96ae0842f0fa9f84\n" }, { "commit": "640fa1526dbc677905dae6d13510f1b9bb423dad", "tree": "fb9b5fbe69946525c1d018b37576c9411e2522cb", "parents": [ "220c0a434a0d3677d798e1742474ae6801b69175", "d48ec695d3dcacf2c5a60dfc34a3084ac5f1b571" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 01:54:58 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 01:54:58 2018 -0700" }, "message": "Merge \"Code reformatting for upcoming automated code changes.\" am: d68f003c67\nam: d48ec695d3\n\nChange-Id: Ic0c27635bc63b0cfdf437fc819b52b9cb2d5244e\n" }, { "commit": "7aa98ce2b05cda26b0843531ca77991a7ba0ae88", "tree": "7670707be7101a7a7c9d603836a8b770cfed9605", "parents": [ "a788c6816bc159187e45332b255d26be27e35f9a", "2495ca3c29aebe72a66670909b2dc02fde3000f4" ], "author": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Fri Aug 17 01:52:21 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 01:52:21 2018 -0700" }, "message": "Merge \"Use 28.txt as API file for migrating NULLs in Metalava\"\nam: 2495ca3c29\n\nChange-Id: I9e1343b1878e73ebb6a83ac4c8a4436d6846baf1\n" }, { "commit": "73ab8fcad1ec286d2ef959e93cf75d9992b9ad6e", "tree": "b9e4378eba512b16965489aed7e6334d1b31dc2f", "parents": [ "6945ee4a84dcd0a4484b7e7a4e5175674e0bcc9b", "8a6ef891edd677c93af7ab488d14da181fcc9b52" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 08:51:17 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 08:51:17 2018 +0000" }, "message": "Merge \"Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()\"" }, { "commit": "6945ee4a84dcd0a4484b7e7a4e5175674e0bcc9b", "tree": "f79a9ce692e1fac0cc5237f6963aeeec5dd45c91", "parents": [ "6574fbe9a91f95b2972f21ae8ba8b1425f366025", "f64f69080da80329bd094bd66433cf3db5272eaa" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 08:51:17 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 08:51:17 2018 +0000" }, "message": "Merge \"remove LocalBluetoothAdapter usage\"" }, { "commit": "6574fbe9a91f95b2972f21ae8ba8b1425f366025", "tree": "fd0cd12cb5eeb433be3589b660afb8dc808fe727", "parents": [ "87c9423c2a9509234bf41a0a52041e82d80cbd1d", "45a477e224df9ef0ee55df2600bbd722afbd3172" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 08:51:17 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 08:51:17 2018 +0000" }, "message": "Merge \"reduce the usage of LocalBluetoothAdapter in LocalBluetoothProfileManager\"" }, { "commit": "220c0a434a0d3677d798e1742474ae6801b69175", "tree": "1032b1834f32a9f194807a1f9278490b2ed6023e", "parents": [ "a5191dacdc87b01e8e3cf45babe3835c0dc19e69", "47ea1e53f3770fb8e0147b27e5513e316d8324f6" ], "author": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Fri Aug 17 01:50:05 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 01:50:05 2018 -0700" }, "message": "Merge \"Resolve NPE and unexpected error code in AccountManagerServiceTest\" am: 6078bc1602\nam: 47ea1e53f3\n\nChange-Id: I39e0644a56a747f4b570b643016cacdc6e250dfc\n" }, { "commit": "87c9423c2a9509234bf41a0a52041e82d80cbd1d", "tree": "d0266ec36f51fe142b0acda221f1c21740c384d7", "parents": [ "b5f7a4e9a7c90b2cce83c1fc07bdda2bf77baebc", "a5191dacdc87b01e8e3cf45babe3835c0dc19e69" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 01:48:58 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 01:48:58 2018 -0700" }, "message": "[automerger skipped] resolve merge conflicts of 2ee069f73d2e9f978fd79b1c779930654d7f074b to stage-aosp-master am: 8b62717128\nam: a5191dacdc -s ours\n\nChange-Id: Id7c20e7d22c7d023929cf4fa80f609698e956cc5\n" }, { "commit": "a788c6816bc159187e45332b255d26be27e35f9a", "tree": "ae16f8c1f8052f0ea545c83b2732170b6ffdc473", "parents": [ "d48ec695d3dcacf2c5a60dfc34a3084ac5f1b571", "c68f5313a22cbdecddacf17fbc1fb8c5c92b8589" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri Aug 17 01:48:48 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 01:48:48 2018 -0700" }, "message": "Merge \"Fix testRegisterUsageCallback failure in setUp\"\nam: c68f5313a2\n\nChange-Id: I516bab9b9b6c5f48845f18d0e2ab8b47f0f809de\n" }, { "commit": "d48ec695d3dcacf2c5a60dfc34a3084ac5f1b571", "tree": "5eb3c06522395cf9e44fdc2d737b35c84f3438b8", "parents": [ "47ea1e53f3770fb8e0147b27e5513e316d8324f6", "d68f003c67ca6364202a57f0c695012d4ea4571e" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 01:44:55 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 01:44:55 2018 -0700" }, "message": "Merge \"Code reformatting for upcoming automated code changes.\"\nam: d68f003c67\n\nChange-Id: I4c95500cddf7659b13ada0ad70584aef190ced7f\n" }, { "commit": "a5191dacdc87b01e8e3cf45babe3835c0dc19e69", "tree": "5f260d4540bc0f6f3a3c715c62739f49df640c06", "parents": [ "00ae427a7e9a77cce98b0b7aa641cc4c4c45d35c", "8b62717128714ea6cb2615aa1dfedb7125c21716" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 01:43:27 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 01:43:27 2018 -0700" }, "message": "resolve merge conflicts of 2ee069f73d2e9f978fd79b1c779930654d7f074b to stage-aosp-master\nam: 8b62717128\n\nChange-Id: Ib32e90ab073d32cc1354c2a3e889ebca813c59f1\n" }, { "commit": "47ea1e53f3770fb8e0147b27e5513e316d8324f6", "tree": "a70bb5c715bf8b839442c5882fa3a7c51b5e47be", "parents": [ "8b62717128714ea6cb2615aa1dfedb7125c21716", "6078bc16026a1ea25da2b539c6021ece252faf2e" ], "author": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Fri Aug 17 01:40:51 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 01:40:51 2018 -0700" }, "message": "Merge \"Resolve NPE and unexpected error code in AccountManagerServiceTest\"\nam: 6078bc1602\n\nChange-Id: I5e9046068f71be3afc18587ae6afa46ff03f12d7\n" }, { "commit": "d9381f5e56f5d9b7ce10c72c50795dcb1c38a8a2", "tree": "154183925851a49b0914605e087ec033c24837c2", "parents": [ "2495ca3c29aebe72a66670909b2dc02fde3000f4", "4dbdcf43ad0dfa91371ac06517317e0ea0b45b56" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 07:46:52 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 17 07:46:52 2018 +0000" }, "message": "Merge \"Add @UnsupportedAppUsage annotations\"" }, { "commit": "8b62717128714ea6cb2615aa1dfedb7125c21716", "tree": "7a14457e18d6de8d0b6c4a7af155145612c33f75", "parents": [ "8f2e5344be2a1869d5e72e97f11fef1b51afb2d4", "2ee069f73d2e9f978fd79b1c779930654d7f074b" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 08:31:04 2018 +0100" }, "committer": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 08:31:16 2018 +0100" }, "message": "resolve merge conflicts of 2ee069f73d2e9f978fd79b1c779930654d7f074b to stage-aosp-master\n\nBug: None\nTest: I solemnly swear I tested this conflict resolution.\nMerged-In: Ia79256a3d04e16dd78331a61af0dcddc5fc1599b\nChange-Id: Ieb9836ae90f6f2565fa3ba5c395b42069b58ff71\n" }, { "commit": "b5f7a4e9a7c90b2cce83c1fc07bdda2bf77baebc", "tree": "d0266ec36f51fe142b0acda221f1c21740c384d7", "parents": [ "0a83cf2c4b6a2e4feca2ed8985959aac7e5e072d", "e420f8b5fb9451412767a4920bd02219e5423f43" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Fri Aug 17 07:05:00 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 07:05:00 2018 +0000" }, "message": "Merge \"Add @UnsupportedAppUsage annotations\"" }, { "commit": "f64f69080da80329bd094bd66433cf3db5272eaa", "tree": "f59ff463005e8bc22a1ee5a27a0755e31b4dc454", "parents": [ "0a83cf2c4b6a2e4feca2ed8985959aac7e5e072d" ], "author": { "name": "timhypeng", "email": "timhypeng@google.com", "time": "Tue Jul 31 15:40:15 2018 +0800" }, "committer": { "name": "hughchen", "email": "hughchen@google.com", "time": "Fri Aug 17 14:24:26 2018 +0800" }, "message": "remove LocalBluetoothAdapter usage\n\n- replace LocalBluetoothAdapter with BluetoothAdapter.getDefaultAdapter() to call functions\n- remove LocalBluetoothAdapter from each Bluetooth profile constructor\n- no more pass LocalBluetoothAdapter to CachedBluetoothDeviceManager::addDevice()\n\nBug: 111815935\nTest: make -j50 RunSettingsLibRoboTests\nChange-Id: I2d2178c6e83034b08690d459973868a9ba583429\n" }, { "commit": "0a83cf2c4b6a2e4feca2ed8985959aac7e5e072d", "tree": "f47c035676b49266681f93cc2e635b3894ada8e3", "parents": [ "d2d33da1f69c7260407745839b6708005c517ca8", "9a0be7278a391e16117c966e45cc9018180749bc" ], "author": { "name": "Kazuki Takise", "email": "takise@google.com", "time": "Fri Aug 17 05:55:05 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 05:55:05 2018 +0000" }, "message": "Merge \"Resolve race condition in TaskStackChangedListenerTest\"" }, { "commit": "2495ca3c29aebe72a66670909b2dc02fde3000f4", "tree": "283427b59c46126a7ec07497e1a2c042ea08adb8", "parents": [ "c68f5313a22cbdecddacf17fbc1fb8c5c92b8589", "1c8219bcdda5481e138368ffb6897ecd9c54f160" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 04:09:20 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 17 04:09:20 2018 +0000" }, "message": "Merge \"Use 28.txt as API file for migrating NULLs in Metalava\"" }, { "commit": "d2d33da1f69c7260407745839b6708005c517ca8", "tree": "3a8ee6ecfed8af90e094a0981ad4c3532f4988ba", "parents": [ "e30dc5112dcecace1ac54ac854273975b0f9d344", "a2f2d82f2698ca4d9fcfad2a94b5b683646c085d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 03:11:10 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 03:11:10 2018 +0000" }, "message": "Merge \"Convert sysui to bp\"" }, { "commit": "e30dc5112dcecace1ac54ac854273975b0f9d344", "tree": "3f8aaa46ef5ced339c4f3ed4e2bdc77f85bb3be6", "parents": [ "b0b48554719313ea44206dde0de1dd3fc8ba94d3", "00ae427a7e9a77cce98b0b7aa641cc4c4c45d35c" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 19:29:51 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 19:29:51 2018 -0700" }, "message": "[automerger skipped] Merge \"Add @UnsupportedAppUsage annotations\" am: 792fb35cee am: 8f2e5344be\nam: 00ae427a7e -s ours\n\nChange-Id: I66a607d3c035a1b4233f1561c06fad7e03899945\n" }, { "commit": "b0b48554719313ea44206dde0de1dd3fc8ba94d3", "tree": "3f8aaa46ef5ced339c4f3ed4e2bdc77f85bb3be6", "parents": [ "21256fc0bdd06dd24d230f3b0877ed75c5336c95", "7bc7929611ebd0f4b8a2240326cf333a165aa030" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Thu Aug 16 19:20:05 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 19:20:05 2018 -0700" }, "message": "[automerger skipped] Merge \"Update docs and ensure PHONE_STATE is more predictable for unknown numbers.\" am: ce7e53a943 am: 7037431901\nam: 7bc7929611 -s ours\n\nChange-Id: I9c4b74002776d7e96ac7cef1db6feffda2abd677\n" }, { "commit": "21256fc0bdd06dd24d230f3b0877ed75c5336c95", "tree": "3f8aaa46ef5ced339c4f3ed4e2bdc77f85bb3be6", "parents": [ "345a4af9afe09cb653e7d71930774e95648da7e1", "8998d79b627e7dce4cedd18716f63563b9e9a45b" ], "author": { "name": "Malcolm Chen", "email": "refuhoo@google.com", "time": "Thu Aug 16 19:08:08 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 19:08:08 2018 -0700" }, "message": "[automerger skipped] Merge \"Add APIs in SubscriptionManager for opportunistic subscriptions\" am: c0a2488df6 am: edf51aebaf\nam: 8998d79b62 -s ours\n\nChange-Id: I6ef7b593a648cc3f36d395646a926130987c02c2\n" }, { "commit": "c68f5313a22cbdecddacf17fbc1fb8c5c92b8589", "tree": "22241f2b92ca96404cb7837887b590742af760e6", "parents": [ "d68f003c67ca6364202a57f0c695012d4ea4571e", "a8e9090cf65b982a9c6d12154e861375922163b6" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri Aug 17 01:51:10 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 17 01:51:10 2018 +0000" }, "message": "Merge \"Fix testRegisterUsageCallback failure in setUp\"" }, { "commit": "45a477e224df9ef0ee55df2600bbd722afbd3172", "tree": "20019a0abfd0c9cb29a7883cdadc095a9d5ea38d", "parents": [ "345a4af9afe09cb653e7d71930774e95648da7e1" ], "author": { "name": "timhypeng", "email": "timhypeng@google.com", "time": "Tue Jul 31 15:32:59 2018 +0800" }, "committer": { "name": "tim peng", "email": "timhypeng@google.com", "time": "Fri Aug 17 01:45:55 2018 +0000" }, "message": "reduce the usage of LocalBluetoothAdapter in LocalBluetoothProfileManager\n\n- LocalBluetoothAdapter is only for setProfileManager() to refresh profiles when Bluetooth turned back on\n- use BluetoothAdapter.getDefaultAdapter() to call getSupportedProfiles()\n- add ShadowBluetoothAdapter.java to handle the test cast without mock adapter\n- no more pass LocalBluetoothAdapter to each Bluetooth profile\n- no more pass LocalBluetoothAdapter to CachedBluetoothDeviceManager::addDevice()\n\nBug: 111815935\nTest: make -j50 RunSettingsLibRoboTests\nChange-Id: I87f328b04cfe86bbd42babb57187e7c0b2638aea\n" }, { "commit": "345a4af9afe09cb653e7d71930774e95648da7e1", "tree": "3f8aaa46ef5ced339c4f3ed4e2bdc77f85bb3be6", "parents": [ "bab866b7ff961c56ede3d7ca941a0547771a9e42", "17ea268961a208d29a34b698530d1b3ea3ba1b6d" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 18:44:12 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 18:44:12 2018 -0700" }, "message": "Merge \"Code reformatting for upcoming automated code changes.\" am: 43f3f60ec0 am: d9b640cbc2\nam: 17ea268961\n\nChange-Id: Ia86c739b9e02e963f3c74b25d67b7663860518bd\n" }, { "commit": "00ae427a7e9a77cce98b0b7aa641cc4c4c45d35c", "tree": "b40e4a0a74e8d4af639814a13bf4bb307369244f", "parents": [ "7bc7929611ebd0f4b8a2240326cf333a165aa030", "8f2e5344be2a1869d5e72e97f11fef1b51afb2d4" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 18:41:55 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 18:41:55 2018 -0700" }, "message": "Merge \"Add @UnsupportedAppUsage annotations\" am: 792fb35cee\nam: 8f2e5344be\n\nChange-Id: Ic37a31fc6bd855209003de26489a4c491dc80291\n" }, { "commit": "bab866b7ff961c56ede3d7ca941a0547771a9e42", "tree": "59442cb74f4f7696295ddc985f3ca8c08678cc28", "parents": [ "f48e7e080c6de2b64dff91ec5f7337511f506eaa", "1bc55c7df55a34a9c338884e50269fc436b89f96" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Thu Aug 16 18:36:51 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 18:36:51 2018 -0700" }, "message": "Merge \"Remove A2DP connect logic from settingslib\" am: bd249a19bb am: 2b614b6ea9\nam: 1bc55c7df5\n\nChange-Id: Ib571b93298c46885d90672dc9330ea67f90d053f\n" }, { "commit": "7bc7929611ebd0f4b8a2240326cf333a165aa030", "tree": "399dcd7847eb3ec73856228898739cbc1d67ccda", "parents": [ "8998d79b627e7dce4cedd18716f63563b9e9a45b", "70374319010d121eface94cff363272091345e62" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Thu Aug 16 18:36:26 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 18:36:26 2018 -0700" }, "message": "Merge \"Update docs and ensure PHONE_STATE is more predictable for unknown numbers.\" am: ce7e53a943\nam: 7037431901\n\nChange-Id: Ib62e8ce01698cc1268b26b0d7b09bed22b75049a\n" }, { "commit": "8998d79b627e7dce4cedd18716f63563b9e9a45b", "tree": "399dcd7847eb3ec73856228898739cbc1d67ccda", "parents": [ "17ea268961a208d29a34b698530d1b3ea3ba1b6d", "edf51aebaf2440e488398a7a5092240fffd60a7f" ], "author": { "name": "Malcolm Chen", "email": "refuhoo@google.com", "time": "Thu Aug 16 18:29:48 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 18:29:48 2018 -0700" }, "message": "Merge \"Add APIs in SubscriptionManager for opportunistic subscriptions\" am: c0a2488df6\nam: edf51aebaf\n\nChange-Id: I99a45e113c76123af1d91d05171456c468ea5fb1\n" }, { "commit": "f48e7e080c6de2b64dff91ec5f7337511f506eaa", "tree": "784be7d57f08a4f9723b23cf77314aa46b51be50", "parents": [ "62d6a21c29768eb5798aa0663338bc72acbe85dc", "4d618965f57948eab414f94e5578ebe3483c1d90" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Aug 16 18:28:39 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 18:28:39 2018 -0700" }, "message": "Merge \"Camera: Documentation update to remove physicalIds\" into pi-dev am: 121d4eee01\nam: 4d618965f5\n\nChange-Id: I1110b463686aa2c8c46b0b9b2db48e41399168bf\n" }, { "commit": "62d6a21c29768eb5798aa0663338bc72acbe85dc", "tree": "36b71d428fc2b8beed96a38c536a5074ad6d405a", "parents": [ "12e1a945ec13a442a4529ec09d4866b8cade39cd", "619e78bacc5c7d78bbc2cccc49ec217d9bcf76c6" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 17 01:23:25 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 01:23:25 2018 +0000" }, "message": "Merge \"Merge \"Add carrier config for auto redialing 911\" into pi-dev am: f87f8a4820 am: 2e272f64b5\"" }, { "commit": "12e1a945ec13a442a4529ec09d4866b8cade39cd", "tree": "36b71d428fc2b8beed96a38c536a5074ad6d405a", "parents": [ "213779db74eac1401f8d5e5151849dab4ea85031", "6f757f8f1ccd5a7c0992245f575c5743972f5647" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 01:22:18 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 01:22:18 2018 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\"" }, { "commit": "619e78bacc5c7d78bbc2cccc49ec217d9bcf76c6", "tree": "3412a57ee007ae31215b8242dbc9b9d77052d463", "parents": [ "213779db74eac1401f8d5e5151849dab4ea85031", "2e272f64b5b65ce13176fbcd56457537e3f41476" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Aug 16 18:21:36 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 18:21:36 2018 -0700" }, "message": "Merge \"Add carrier config for auto redialing 911\" into pi-dev am: f87f8a4820\nam: 2e272f64b5\n\nChange-Id: I7940ee529c2f16781a6f9d235a83de16e2afaa5a\n" }, { "commit": "213779db74eac1401f8d5e5151849dab4ea85031", "tree": "3412a57ee007ae31215b8242dbc9b9d77052d463", "parents": [ "9744262ffa4effba26000ee182cc299fe7df84b2", "bb499d7901ad7f3387d0e794c8388e5e802cbeb2" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 17 01:15:38 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 01:15:38 2018 +0000" }, "message": "Merge \"[automerger skipped] Merge \"Separated emergency option final UI\" am: c906be3b4f am: e18215a780 am: 238ec7d9e1 -s ours\"" }, { "commit": "bb499d7901ad7f3387d0e794c8388e5e802cbeb2", "tree": "11792f890d401374913f902aeae46719f35e0070", "parents": [ "e5d363d85bb8afa077ba43c4908fc72a0886d5c8", "238ec7d9e139c9b42a3242a95ae3df64f080cda1" ], "author": { "name": "Wesley.CW Wang", "email": "wesleycwwang@google.com", "time": "Thu Aug 16 18:15:09 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 18:15:09 2018 -0700" }, "message": "[automerger skipped] Merge \"Separated emergency option final UI\" am: c906be3b4f am: e18215a780\nam: 238ec7d9e1 -s ours\n\nChange-Id: I7444dd2b61518b2a9503dec5fb0867b5fde2bab6\n" }, { "commit": "9744262ffa4effba26000ee182cc299fe7df84b2", "tree": "3412a57ee007ae31215b8242dbc9b9d77052d463", "parents": [ "e5d363d85bb8afa077ba43c4908fc72a0886d5c8", "48ecef4bfb9db6328076ae159cab5c6720b1fc7e" ], "author": { "name": "Jeff Chang", "email": "chengjeff@google.com", "time": "Fri Aug 17 01:14:51 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 01:14:51 2018 +0000" }, "message": "Merge \"Support the toast Window to show on the secondary display.\"" }, { "commit": "e5d363d85bb8afa077ba43c4908fc72a0886d5c8", "tree": "11792f890d401374913f902aeae46719f35e0070", "parents": [ "ce5035882b79ad2dac1fec6537061d0345a8048c", "217e5f01cac7a933c3801bfcf554531162b8b105" ], "author": { "name": "CY Cheng", "email": "cycheng@google.com", "time": "Thu Aug 16 18:07:50 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 18:07:50 2018 -0700" }, "message": "[automerger skipped] resolve merge conflicts of e58c7805711b76fcb92fad0b7c4a57651176cf50 to stage-aosp-master am: 0f7856add6\nam: 217e5f01ca -s ours\n\nChange-Id: I03e1522cd18edf56fac938026377f56528332b0b\n" }, { "commit": "8f2e5344be2a1869d5e72e97f11fef1b51afb2d4", "tree": "299a280f425586cb428122fb663e483d7c031986", "parents": [ "70374319010d121eface94cff363272091345e62", "792fb35ceea6f3b091940d4360a12049333f1039" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 17:57:57 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 17:57:57 2018 -0700" }, "message": "Merge \"Add @UnsupportedAppUsage annotations\"\nam: 792fb35cee\n\nChange-Id: If9bbbd7c2011e067b79b81f8fe1c785772db56cf\n" }, { "commit": "70374319010d121eface94cff363272091345e62", "tree": "51a58e14cb55d9416349c411dd72e85cb9038353", "parents": [ "edf51aebaf2440e488398a7a5092240fffd60a7f", "ce7e53a9438ee943607abd6b967c935098b221f5" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Thu Aug 16 17:49:02 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 17:49:02 2018 -0700" }, "message": "Merge \"Update docs and ensure PHONE_STATE is more predictable for unknown numbers.\"\nam: ce7e53a943\n\nChange-Id: I13c13fb9cd87b694d9874420a55b75d7b3e3f63b\n" }, { "commit": "17ea268961a208d29a34b698530d1b3ea3ba1b6d", "tree": "c2331c31fd5faf436873f42cf9c5e6c84353cff5", "parents": [ "1bc55c7df55a34a9c338884e50269fc436b89f96", "d9b640cbc2b9e71bb54f3da132b9966456e07938" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 17:43:10 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 17:43:10 2018 -0700" }, "message": "Merge \"Code reformatting for upcoming automated code changes.\" am: 43f3f60ec0\nam: d9b640cbc2\n\nChange-Id: I4e8f9adde429507c9136a4bf25ecfc1a7299ad6d\n" }, { "commit": "1bc55c7df55a34a9c338884e50269fc436b89f96", "tree": "7fff432601e5837491ad8d9687dd55d081982924", "parents": [ "4d618965f57948eab414f94e5578ebe3483c1d90", "2b614b6ea9e9a17033ce1e60efa24b14aa43abe1" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Thu Aug 16 17:36:23 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 17:36:23 2018 -0700" }, "message": "Merge \"Remove A2DP connect logic from settingslib\" am: bd249a19bb\nam: 2b614b6ea9\n\nChange-Id: Iea5dd7f438b8e25e1d8b67ae6be4c320e701d406\n" }, { "commit": "edf51aebaf2440e488398a7a5092240fffd60a7f", "tree": "51a58e14cb55d9416349c411dd72e85cb9038353", "parents": [ "d9b640cbc2b9e71bb54f3da132b9966456e07938", "c0a2488df606965f78c6c36ef189140d5ffdc7b4" ], "author": { "name": "Malcolm Chen", "email": "refuhoo@google.com", "time": "Thu Aug 16 17:35:07 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 17:35:07 2018 -0700" }, "message": "Merge \"Add APIs in SubscriptionManager for opportunistic subscriptions\"\nam: c0a2488df6\n\nChange-Id: Id826b13c39e594110f5813b632f1db4cec6baa4a\n" }, { "commit": "4d618965f57948eab414f94e5578ebe3483c1d90", "tree": "b80fae7f1cd1f9ae0f90638af0949578d3a7145f", "parents": [ "2e272f64b5b65ce13176fbcd56457537e3f41476", "121d4eee01f16e5b0c355f0f7813839ecb52aa87" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Aug 16 17:29:35 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 17:29:35 2018 -0700" }, "message": "Merge \"Camera: Documentation update to remove physicalIds\" into pi-dev\nam: 121d4eee01\n\nChange-Id: I334f150cbd93df5a3b0abcb23c955bcea9367058\n" }, { "commit": "2e272f64b5b65ce13176fbcd56457537e3f41476", "tree": "0d1f126013a402c4a75ea4d6ba51f0d7197e202a", "parents": [ "238ec7d9e139c9b42a3242a95ae3df64f080cda1", "f87f8a482023c71f3dc8a6eb6640bef9f273932e" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Aug 16 17:21:04 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 17:21:04 2018 -0700" }, "message": "Merge \"Add carrier config for auto redialing 911\" into pi-dev\nam: f87f8a4820\n\nChange-Id: Ib3d717b2628a0d8f17c5e7c83b10a0e85e338893\n" }, { "commit": "1c8219bcdda5481e138368ffb6897ecd9c54f160", "tree": "395032b82764a32d21de76f3e9b108941cc59927", "parents": [ "d5dc5a7168711f36553e85315842d7b64f8bfea2" ], "author": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Thu Aug 16 17:10:22 2018 -0700" }, "committer": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Thu Aug 16 17:10:22 2018 -0700" }, "message": "Use 28.txt as API file for migrating NULLs in Metalava\n\nUse last released API file for annotations reference in master branch\n(non-releasing branch).\n\nTest: manual\nBug: b/78245848\nChange-Id: I0520231619001032c00d98fdc8cd86aa41f4fa14\n" }, { "commit": "d9b640cbc2b9e71bb54f3da132b9966456e07938", "tree": "fb97e5744f75087b93be0755c09f5f6977022a79", "parents": [ "2b614b6ea9e9a17033ce1e60efa24b14aa43abe1", "43f3f60ec01a1d658cbff9386a7fbf8a839894b9" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 16:56:06 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 16:56:06 2018 -0700" }, "message": "Merge \"Code reformatting for upcoming automated code changes.\"\nam: 43f3f60ec0\n\nChange-Id: Id11efe22dffc7edd46d5dc2244b7121f664fba4d\n" }, { "commit": "2b614b6ea9e9a17033ce1e60efa24b14aa43abe1", "tree": "589fb966b4d751222fd2a36d910b6f31c005b759", "parents": [ "e18215a7805496256fd58cf6388608a881fde523", "bd249a19bba38a29e617aa849b2f42c3c281eff5" ], "author": { "name": "Chienyuan", "email": "chienyuanhuang@google.com", "time": "Thu Aug 16 16:48:48 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 16:48:48 2018 -0700" }, "message": "Merge \"Remove A2DP connect logic from settingslib\"\nam: bd249a19bb\n\nChange-Id: I7961d4430eddc17490a4c81baeb61a4d6f2a55bf\n" }, { "commit": "238ec7d9e139c9b42a3242a95ae3df64f080cda1", "tree": "0d1f126013a402c4a75ea4d6ba51f0d7197e202a", "parents": [ "217e5f01cac7a933c3801bfcf554531162b8b105", "e18215a7805496256fd58cf6388608a881fde523" ], "author": { "name": "Wesley.CW Wang", "email": "wesleycwwang@google.com", "time": "Thu Aug 16 16:48:44 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 16:48:44 2018 -0700" }, "message": "Merge \"Separated emergency option final UI\" am: c906be3b4f\nam: e18215a780\n\nChange-Id: I72454009423239350cbb55be72598118e3b633f7\n" }, { "commit": "6f757f8f1ccd5a7c0992245f575c5743972f5647", "tree": "13094374e298cd3c5fde1b9b61556afcfd0e6e87", "parents": [ "64348d10ce5b4fc3d938163e98efae7572f0d697" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Aug 16 16:43:47 2018 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Aug 16 16:43:47 2018 -0700" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I940ff96b807dc3c6adaae09dec2bb73ca7d3466d\nAuto-generated-cl: translation import\n" }, { "commit": "e18215a7805496256fd58cf6388608a881fde523", "tree": "fabd26fc203d6866a647074cbd3573d054f6bc13", "parents": [ "0f7856add6490b2915ae5ff0c52c42e7b82c7c09", "c906be3b4f84beeb890254b7965991f40c9a3779" ], "author": { "name": "Wesley.CW Wang", "email": "wesleycwwang@google.com", "time": "Thu Aug 16 16:43:04 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 16:43:04 2018 -0700" }, "message": "Merge \"Separated emergency option final UI\"\nam: c906be3b4f\n\nChange-Id: I14c3d0146d02ecd770a00a099231eeb7b3d9d03a\n" }, { "commit": "217e5f01cac7a933c3801bfcf554531162b8b105", "tree": "917f61a8f81512485789c34cfe09d7e7cb605802", "parents": [ "8142499cdbd2c35a6da484aed827256bc9feded5", "0f7856add6490b2915ae5ff0c52c42e7b82c7c09" ], "author": { "name": "CY Cheng", "email": "cycheng@google.com", "time": "Thu Aug 16 16:41:38 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 16:41:38 2018 -0700" }, "message": "resolve merge conflicts of e58c7805711b76fcb92fad0b7c4a57651176cf50 to stage-aosp-master\nam: 0f7856add6\n\nChange-Id: I7b763616c1244d3f834e33c3d6e7126c0baa1b59\n" }, { "commit": "a2f2d82f2698ca4d9fcfad2a94b5b683646c085d", "tree": "2318328045465998936e9b96b0cda2d2b0050525", "parents": [ "4c1651139d0657ef9d998cfdd9eb1298a29e2208" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Mon Aug 13 11:10:48 2018 -0400" }, "committer": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Thu Aug 16 19:40:39 2018 -0400" }, "message": "Convert sysui to bp\n\nTest: tests gonna test, builds gonna build\nChange-Id: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264\n" }, { "commit": "121d4eee01f16e5b0c355f0f7813839ecb52aa87", "tree": "af8501b54b3858c30226c51c30ae04d076043624", "parents": [ "f87f8a482023c71f3dc8a6eb6640bef9f273932e", "de23d28d07b4095009dd3eed1cfd49a35e2b77d6" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 23:00:33 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 23:00:33 2018 +0000" }, "message": "Merge \"Camera: Documentation update to remove physicalIds\" into pi-dev" }, { "commit": "de23d28d07b4095009dd3eed1cfd49a35e2b77d6", "tree": "21d6e2afc53bcb4e3fc532a073786ca6c9e3d382", "parents": [ "8913a0632903ad36695286b4be123633026244e3" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Wed Aug 15 14:01:45 2018 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Aug 16 22:59:54 2018 +0000" }, "message": "Camera: Documentation update to remove physicalIds\n\nPublic API doesn\u0027t see android.logicalcam.physicalIds. Remove it\nfrom public doc.\n\nBug: 112655222\nTest: make offline-sdk-docs\nChange-Id: Idf6958fb7c117912e33ece4fbaed04cb8e5e14c0\n" }, { "commit": "f87f8a482023c71f3dc8a6eb6640bef9f273932e", "tree": "e5cbf17cd333688637e0ce02c978c2c81573782b", "parents": [ "5cd354c89cd3a48aa306e7f8fcaafb4417fa0a40", "7d9a33efb75f949750c4dff9d7a5bb475b1047e4" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Aug 16 22:57:13 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 22:57:13 2018 +0000" }, "message": "Merge \"Add carrier config for auto redialing 911\" into pi-dev" }, { "commit": "ce5035882b79ad2dac1fec6537061d0345a8048c", "tree": "11792f890d401374913f902aeae46719f35e0070", "parents": [ "c3e03900d44e4249df229636a1c6068d6154f71f", "65909d38a861cb194c03433121292883fdc25a5f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 22:00:32 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 22:00:32 2018 +0000" }, "message": "Merge \"Non-pre-multiplied notification text color\"" }, { "commit": "c3e03900d44e4249df229636a1c6068d6154f71f", "tree": "63b59adef1a961087bb611424302846c2d79f6a4", "parents": [ "64348d10ce5b4fc3d938163e98efae7572f0d697", "c81702eb62d46191deaa2b08c4d3278911778e5b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 21:45:53 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 21:45:53 2018 +0000" }, "message": "Merge \"Reach gesture implementation\"" }, { "commit": "64348d10ce5b4fc3d938163e98efae7572f0d697", "tree": "d0ec086934fc24641c0c91f6deea900f80cdcff8", "parents": [ "eaff01c0b04cfc33eac80b08c9c6bce39f20a82d", "a0d5119c38e2dedd2bc1d00554c26a5bd3925614" ], "author": { "name": "Lucas Dupin", "email": "dupin@google.com", "time": "Thu Aug 16 20:43:38 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 20:43:38 2018 +0000" }, "message": "Merge \"Avoid binder call when binding Slice\"" }, { "commit": "eaff01c0b04cfc33eac80b08c9c6bce39f20a82d", "tree": "f8f1f659fd9b3aade3b787c44a29e584cc2d5f94", "parents": [ "b720d5d709c26346105798b88b54bcc1275291de", "299c45c85d41975514022263fa6a29329eb5a0bc" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 20:41:46 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 20:41:46 2018 +0000" }, "message": "Merge \"Never clear QS tile state.\"" }, { "commit": "c81702eb62d46191deaa2b08c4d3278911778e5b", "tree": "34f635f89a24c920356c065c7e368d17b70178f7", "parents": [ "dee54a448ba7068cea61a3259d91190b56ec1c55" ], "author": { "name": "Lucas Dupin", "email": "dupin@google.com", "time": "Thu Aug 09 15:41:55 2018 -0700" }, "committer": { "name": "Lucas Dupin", "email": "dupin@google.com", "time": "Thu Aug 16 11:59:29 2018 -0700" }, "message": "Reach gesture implementation\n\nAdd configurable doze gesture. OEMs should define the gesture type\non a device overlay.\n\nBug: 111414690\nTest: look at logs in adb shell dumpsys activity service com.android.systemui\nTest: manual with alternative sensor event\nChange-Id: I048b99b53151427006e42eb6b4780a420020cd78\n" }, { "commit": "b720d5d709c26346105798b88b54bcc1275291de", "tree": "a4d0cf7c9827186d9bdc88ea9f8f8ed350387f8e", "parents": [ "dee54a448ba7068cea61a3259d91190b56ec1c55", "59728ce4908b562cf4529be4461b91d2a306f428" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 18:58:08 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 18:58:08 2018 +0000" }, "message": "Merge \"Fix circle in the opa ring and enlarge circle when opa is disabled (1/2)\"" }, { "commit": "d68f003c67ca6364202a57f0c695012d4ea4571e", "tree": "727006d16de159029bb7f7b9c8a2d7dcb8bf9867", "parents": [ "6078bc16026a1ea25da2b539c6021ece252faf2e", "74e7aed9c60e1703f34d054e1f2c91e80f1e7aba" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 18:54:30 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 18:54:30 2018 +0000" }, "message": "Merge \"Code reformatting for upcoming automated code changes.\"" }, { "commit": "6078bc16026a1ea25da2b539c6021ece252faf2e", "tree": "c4d01d8142c18387fa0a45882a5f8c7bf9ef3ec1", "parents": [ "2ee069f73d2e9f978fd79b1c779930654d7f074b", "ccf15f79f08f2c96cffdc46c4f357d3a545df08e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 18:25:56 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 18:25:56 2018 +0000" }, "message": "Merge \"Resolve NPE and unexpected error code in AccountManagerServiceTest\"" }, { "commit": "ccf15f79f08f2c96cffdc46c4f357d3a545df08e", "tree": "e7418308fbded002b3fabb0f745f7d5fa024aaff", "parents": [ "7955aec0eaf725f300f2cd79d0beda56e33971a7" ], "author": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Thu Aug 09 16:12:42 2018 -0700" }, "committer": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Thu Aug 16 17:59:45 2018 +0000" }, "message": "Resolve NPE and unexpected error code in AccountManagerServiceTest\n\nag/3915086 modified AccountManagerService to use the PackageManagerInternal returned from\nLocalServices. However when AccountManagerServiceTest runs tests against AccountManagerService\nit is using a local instance of the object which does not have access to system\u0027s local\nPackageManagerInternal. To resolve this a mock PackageManagerInternal is added to the LocalServices\nwith a mocked hasSignatureCapability that returns an appropriate response based on the test. This\nfix also exposed an issue that appears to be introduced by ag/2959363; with the change in\ncheckKeyIntent to no longer throw a SecurityException the expected return code for error paths\nis now AccountManager.ERROR_CODE_REMOTE_EXCEPTION.\n\nA small change was also added to AccountsDbTest to skip testCeNotAvailableInitially on eng builds\nas the Log.wtf would crash the test process when invoked on eng builds.\n\nTest: adb shell am instrument -w -e package com.android.server.accounts \\\n com.android.frameworks.servicestests/\\\n android.support.test.runner.AndroidJUnitRunner\nBug: 80380639\n\nChange-Id: I9438550d1c19cc86ec56991da766d71e068784ab\nMerged-In: I9438550d1c19cc86ec56991da766d71e068784ab\n" }, { "commit": "dee54a448ba7068cea61a3259d91190b56ec1c55", "tree": "d8a5c026e46104c2288bdb536b34d6859f55f918", "parents": [ "6e6a4ce687a4bae8d4c252054a10fcd2e715c8b7", "c76ea600852529895c0fb7bd4e067bab7ce435d7" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 17:50:13 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 17:50:13 2018 +0000" }, "message": "Merge \"Resolve NPE and unexpected error code in AccountManagerServiceTest\"" }, { "commit": "4dbdcf43ad0dfa91371ac06517317e0ea0b45b56", "tree": "bf224c82a42e0228aae034faba6fae5f947394a7", "parents": [ "43f3f60ec01a1d658cbff9386a7fbf8a839894b9" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 18:49:37 2018 +0100" }, "committer": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 18:49:37 2018 +0100" }, "message": "Add @UnsupportedAppUsage annotations\n\nFor packages:\n android.security.net.config\n android.security.keystore\n android.security.keymaster\n android.security\n\nThis is an automatically generated CL. See go/UnsupportedAppUsage\nfor more details.\n\nExempted-From-Owner-Approval: Mechanical changes to the codebase\nwhich have been approved by Android API council and announced on\nandroid-eng@\n\nBug: 110868826\nTest: m\nChange-Id: Ifed4da56531195f64fd53d84f14b4e8298843b2c\nMerged-In: I7762dd647bede8abc9be2c538af3a3a99a25a73e\n" }, { "commit": "6e6a4ce687a4bae8d4c252054a10fcd2e715c8b7", "tree": "c042ecac2a28dbce5f50542f2511796c8e256734", "parents": [ "ead275e19fc9ffbd751b3956a84e27844b97ffe7", "8f3763dc71dc95fb8fbc06a341f6f880dedb33d1" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 17:48:24 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 17:48:24 2018 +0000" }, "message": "Merge \"Talkback for edit QS, action as part of context.\"" }, { "commit": "e420f8b5fb9451412767a4920bd02219e5423f43", "tree": "18428ef8a42208fb9b8911e9c84e829bad906f59", "parents": [ "1e14f9f92a35e61c24ec53410740e588e4ba8b39" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 18:40:47 2018 +0100" }, "committer": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 18:40:47 2018 +0100" }, "message": "Add @UnsupportedAppUsage annotations\n\nFor packages:\n android.security.net.config\n android.security.keystore\n android.security.keymaster\n android.security\n\nThis is an automatically generated CL. See go/UnsupportedAppUsage\nfor more details.\n\nExempted-From-Owner-Approval: Mechanical changes to the codebase\nwhich have been approved by Android API council and announced on\nandroid-eng@\n\nBug: 110868826\nTest: m\nChange-Id: I7762dd647bede8abc9be2c538af3a3a99a25a73e\n" }, { "commit": "ead275e19fc9ffbd751b3956a84e27844b97ffe7", "tree": "f19915c04e52949cb29908ef1e0f6588ad98d766", "parents": [ "a60283fdd1f2c67259e8b0c10d88ecfb60a1328b", "f3649d669059b924ce9eb3eb7909cbf0a2ed31a8" ], "author": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Thu Aug 16 17:26:08 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 17:26:08 2018 +0000" }, "message": "Merge \"AAPT2: Compile --zip flag\"" }, { "commit": "a60283fdd1f2c67259e8b0c10d88ecfb60a1328b", "tree": "538fcc4bb08b01ba15fadf67d28a5d1226c0c9ce", "parents": [ "1e14f9f92a35e61c24ec53410740e588e4ba8b39", "5d2755129dae6ff6f0061da0abe634f44054b23e" ], "author": { "name": "Ryan Mitchell", "email": "rtmitchell@google.com", "time": "Thu Aug 16 17:24:47 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 17:24:47 2018 +0000" }, "message": "Merge \"AAPT2: Reformatted dump command invocations\"" }, { "commit": "2ee069f73d2e9f978fd79b1c779930654d7f074b", "tree": "5ae40da56c6510dcb77c4de4dc73b6917605f7b0", "parents": [ "792fb35ceea6f3b091940d4360a12049333f1039", "1c77a11db2bb9fe3f848aaa35ba501930ae3544f" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 16:37:49 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 16:37:49 2018 +0000" }, "message": "Merge \"Add @UnsupportedAppUsage annotations\"" }, { "commit": "74e7aed9c60e1703f34d054e1f2c91e80f1e7aba", "tree": "a9813450035982cd18c420af099f1f8b564d73b3", "parents": [ "43f3f60ec01a1d658cbff9386a7fbf8a839894b9" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 17:29:31 2018 +0100" }, "committer": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 17:29:31 2018 +0100" }, "message": "Code reformatting for upcoming automated code changes.\n\nAdding annotations to individual fields cannot be easily done when there\nare two fields defined in a single statement. Put each definition in a\nstatement of its own.\n\nSee go/UnsupportedAppUsage for more context.\n\nBug: 110868826\nTest: m\nChange-Id: I7756185bdfdca15fa8f73ef4b76c4f70abcd8ea6\n" }, { "commit": "792fb35ceea6f3b091940d4360a12049333f1039", "tree": "87dc34bdf9760deaf56e510b69696b079bbbcc87", "parents": [ "ce7e53a9438ee943607abd6b967c935098b221f5", "bbce9470925ef1111576c6717e890f6611620eb4" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 16:16:48 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 16:16:48 2018 +0000" }, "message": "Merge \"Add @UnsupportedAppUsage annotations\"" }, { "commit": "299c45c85d41975514022263fa6a29329eb5a0bc", "tree": "f291d1fd733f59359740032a1cc154b4c09da79d", "parents": [ "ace398c3fb3fb89e368d9b35f5fbcc13924bb2b3" ], "author": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Thu Aug 16 10:49:48 2018 -0400" }, "committer": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Thu Aug 16 12:08:36 2018 -0400" }, "message": "Never clear QS tile state.\n\nQSTile#clearState puts QS tiles in an invalid state that may not be\nimmediately rectified through QSTile#refreshState. In the case of\nconfiguration changes, if a subclass implementation of\nQSTile#handleSetListening does not trigger a refresh state, the\ninvalid state causes incorrect click handling.\n\nChange-Id: I17eba133cf08c45a768e9e0ed8fda623e85b4370\nFixes: 69738120\nFixes: 110480955\nTest: manual\n" }, { "commit": "8f3763dc71dc95fb8fbc06a341f6f880dedb33d1", "tree": "fde8345933380bf2e6ea1cac32f1492844364178", "parents": [ "0253c3f48a50581d43de419df9376fb0f5e7895b" ], "author": { "name": "Fabian Kozynski", "email": "kozynski@google.com", "time": "Thu Aug 16 09:57:33 2018 -0400" }, "committer": { "name": "Fabian Kozynski", "email": "kozynski@google.com", "time": "Thu Aug 16 11:37:17 2018 -0400" }, "message": "Talkback for edit QS, action as part of context.\n\nAccessibility context for moving or adding tiles has context label as\n\"Add tile X to position Y\" or \"Move tile X to position Y\" while moving\ncursor. No confirmation announcement after accepting.\n\nRemoved unused strings.\n\nChange-Id: I6cf0fbe110f9231e592ee51820edd24541f98c5c\nFixes: 79154713\nTest: Manual\n" }, { "commit": "ce7e53a9438ee943607abd6b967c935098b221f5", "tree": "b40a0cc24354f5030cd4301dc4f7c479dc9b4ad0", "parents": [ "c0a2488df606965f78c6c36ef189140d5ffdc7b4", "b8bd19ed4531a6b75bf3ce407da1d5bc1d1310bf" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 15:22:23 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 15:22:23 2018 +0000" }, "message": "Merge \"Update docs and ensure PHONE_STATE is more predictable for unknown numbers.\"" }, { "commit": "b8bd19ed4531a6b75bf3ce407da1d5bc1d1310bf", "tree": "a088190d7b51e11ad4ff2b1101b18fcfa06542e2", "parents": [ "d717c04b120149c9283b88b28d51557c7bcf3199" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Tue Jun 19 09:55:43 2018 -0700" }, "committer": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Thu Aug 16 07:33:38 2018 -0700" }, "message": "Update docs and ensure PHONE_STATE is more predictable for unknown numbers.\n\nIn P the PHONE_STATE broadcast behavior changed due to new permission\nrequirements. Updating the API docs for this broadcast to make it more\nclear to developers how the broadcast will work given different permission\nscenarios.\n\nAlso, made a minor change to how the \"EXTRA_INCOMING_NUMBER\" is populated\non the phone state broadcast. Originally we opted to remove\nEXTRA_INCOMING_NUMBER when the number is empty. Developer feedback reveals\nit is difficult to know for an unknown caller (where numer is empty)\nwhether the broadcast they\u0027re receiving is the one associated with the\nbroadcast for receivers with READ_CALL_LOG, or the one for receivers\nwithout it. This minor change eliminates the need to count broadcasts and\ninstead allows the developer to just focus on whether the extra is present\nor not.\n\nTest: make docs and verify the javadoc appears as expected.\nTest: Used test app to confirm functionality.\nBug: 110190165\nMerged-In: I55e3519fcbad4dcb7da041d0194bf4e1c7d38949\nChange-Id: I35967d53274b99d66b63f4ff5acb60a689745f9d\n" }, { "commit": "c0a2488df606965f78c6c36ef189140d5ffdc7b4", "tree": "5436c76e8e504f61c12c2e57a66ad04c50042169", "parents": [ "43f3f60ec01a1d658cbff9386a7fbf8a839894b9", "0ac24ef3497e1db5c08daccb8fd769fc08ee5f88" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 16 14:04:45 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 14:04:45 2018 +0000" }, "message": "Merge \"Add APIs in SubscriptionManager for opportunistic subscriptions\"" }, { "commit": "1e14f9f92a35e61c24ec53410740e588e4ba8b39", "tree": "edb1272ca9028529427741e2d625ba2203ad1dce", "parents": [ "7c6ceb23dbbd6c6e8be4d593ed22ff1b491648cf" ], "author": { "name": "Brad Stenning", "email": "stenning@google.com", "time": "Fri Aug 10 14:39:26 2018 -0700" }, "committer": { "name": "Brad Stenning", "email": "stenning@google.com", "time": "Thu Aug 16 13:51:57 2018 +0000" }, "message": "Bypass Zenmode filtering when the notification is marked as critical\n\nTest: enable dnd and use test app to send Car_emergency\nBug: 111793232\nChange-Id: I6492c1e48429c5f199680c76d53248da8072f4ff\n" }, { "commit": "7c6ceb23dbbd6c6e8be4d593ed22ff1b491648cf", "tree": "4ac9b1e597751b992fe75e4f5d8a3be8ae51e195", "parents": [ "4c1651139d0657ef9d998cfdd9eb1298a29e2208", "b90dc43e15575741d98dc8de17972949430f0acf" ], "author": { "name": "Pavel Grafov", "email": "pgrafov@google.com", "time": "Thu Aug 16 13:49:32 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 13:49:32 2018 +0000" }, "message": "Merge \"Use DPM\u0027s counter for invalid password attempts\"" }, { "commit": "b90dc43e15575741d98dc8de17972949430f0acf", "tree": "5678098dff57e241b356006e35d4e163a1376f24", "parents": [ "63796b8a2bce722290d92b934f9153b1e227a032" ], "author": { "name": "Pavel Grafov", "email": "pgrafov@google.com", "time": "Wed Aug 15 20:02:58 2018 +0100" }, "committer": { "name": "Pavel Grafov", "email": "pgrafov@google.com", "time": "Thu Aug 16 14:31:08 2018 +0100" }, "message": "Use DPM\u0027s counter for invalid password attempts\n\nCurrently Keyguard uses separate counter for invalid password attempts\nthat is not persisted and is always initialized to zero after boot,\nso if the user made several attempts and rebooted the device, the\ndevice will show more allowed attempts before wipe than actually\navailable. The counter is also incorrectly reset to zero when\nfingerprint is used successfully.\n\nWith this CL the same counter is used for that message and for actual\nwipe triggering, it is persisted and is not reset upon reboot or\nfingerprint authehtication.\n\nCounting failed password attempts should be available in DevicePolicyManager\neven without PackageManager.FEATURE_DEVICE_ADMIN.\n\nTest: manual, tried using fingerprint and rebooting.\nBug: 112588257\nChange-Id: I1f4012a95c6f6758885206f69e7ebe2c3704a567\n" }, { "commit": "4c1651139d0657ef9d998cfdd9eb1298a29e2208", "tree": "f41ee20b33bc43d12332c08a5513609f230c77cf", "parents": [ "03ebe02009dc6fe97f817618bbd10ca8e2cf2e2d", "8142499cdbd2c35a6da484aed827256bc9feded5" ], "author": { "name": "Malcolm Chen", "email": "refuhoo@google.com", "time": "Thu Aug 16 04:25:31 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 04:25:31 2018 -0700" }, "message": "[automerger skipped] Merge \"Abstract set APIs in SubscriptionManager\" am: 5165bbdeff am: 67c542f374\nam: 8142499cdb -s ours\n\nChange-Id: Ib8f0f1b80ececb63903ce0c339e023ff46a280b6\n" }, { "commit": "03ebe02009dc6fe97f817618bbd10ca8e2cf2e2d", "tree": "f41ee20b33bc43d12332c08a5513609f230c77cf", "parents": [ "968fb9c5fa0b3b01fc0153212e227c6163a68dab", "db8351b2cd225d8942858ed66d04d23dc2524b56" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Aug 16 04:17:26 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 04:17:26 2018 -0700" }, "message": "Merge \"Simplify IWeaver mocking code.\" am: d5dc5a7168 am: a64d04f5fe\nam: db8351b2cd\n\nChange-Id: I0f777ca9d737255f388594a228e1b9cf2cb5ca88\n" }, { "commit": "968fb9c5fa0b3b01fc0153212e227c6163a68dab", "tree": "a3c31e8557842533f0bba9e1341f0e017371efc1", "parents": [ "a88948db0afa82ae0da07bc7a3a126df16398c2c", "6b269a7e2603bd9f8053345477621ba9882f4813" ], "author": { "name": "Mathew Inwood", "email": "mathewi@google.com", "time": "Thu Aug 16 04:09:37 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 16 04:09:37 2018 -0700" }, "message": "[automerger skipped] Merge \"Add @UnsupportedAppUsage annotations\" am: d717c04b12 am: 629a3828e2\nam: 6b269a7e26 -s ours\n\nChange-Id: Ic0cc520e264f50d8425af1a026e109a96d5cd534\n" } ], "next": "a88948db0afa82ae0da07bc7a3a126df16398c2c" }