)]}' { "log": [ { "commit": "8cb78fcb1ef1f196b36f841bc5c04288f5b6299f", "tree": "b66c432755c2b6db93c0da9a62242e0cee263225", "parents": [ "5c16aa778a744f128c99b474279c2f552eee7079", "8046ba6ef327597e573a6af33e51893f3fb59309" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 10 21:01:52 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 10 21:01:52 2018 +0000" }, "message": "Merge \"Sending BATTERY_LEVEL_CHANGED when plug type changes\" into pi-dev" }, { "commit": "5c16aa778a744f128c99b474279c2f552eee7079", "tree": "f519eb5d393862a22e3855f6f6c39b0a5c550457", "parents": [ "a0bda20ae0338ec8ac6dc9eaf479aa1556fb90f9", "3375c14aefe5479d452dc0fcaffa7e86460b230a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Aug 10 12:52:50 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:52:50 2018 -0700" }, "message": "[automerger skipped] Merge changes from topic \"back111085900\" into oc-dev am: f0095ec4d6 am: 5e8e47d4f8\nam: 3375c14aef -s ours\n\nChange-Id: I345878aeec43a19778f70e0bf325b3e278bab682\n" }, { "commit": "a0bda20ae0338ec8ac6dc9eaf479aa1556fb90f9", "tree": "f519eb5d393862a22e3855f6f6c39b0a5c550457", "parents": [ "205895e6e87e93d61bbb03dacf2e471ba21da599", "d270842f22e22a47c0311690ca13c300b525a7f2" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 12:46:36 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:46:36 2018 -0700" }, "message": "[automerger skipped] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 5a55a72fcd am: 628667ac86\nam: d270842f22 -s ours\n\nChange-Id: I6bf1c307208a1db1bdb67574801a472dbc27f97d\n" }, { "commit": "205895e6e87e93d61bbb03dacf2e471ba21da599", "tree": "f519eb5d393862a22e3855f6f6c39b0a5c550457", "parents": [ "b630be0b51646ff7c8a972cf5af1488ed1163733", "2adafa92bcbec4f9f2ef12051c755f9abbc503c7" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 12:45:27 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:45:27 2018 -0700" }, "message": "[automerger skipped] [automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f skipped: a2ad2596b7 am: 4ccfb1d0aa am: efe1afbf93\nam: 2adafa92bc -s ours\n\nChange-Id: Iec62f49c864d2380025b9a64dab868bcce7512fc\n" }, { "commit": "b630be0b51646ff7c8a972cf5af1488ed1163733", "tree": "f519eb5d393862a22e3855f6f6c39b0a5c550457", "parents": [ "3eef28d461b4fb20cd389f6eb6d620d1dfbbb221", "798655e2e114230ffa52e6017537cc026f29fc34" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 12:44:12 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:44:12 2018 -0700" }, "message": "[automerger skipped] [automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209 am: ca5fd693bc skipped: 19d2af61df am: f5c1a7ca27 am: b2ed78a197\nam: 798655e2e1 -s ours\n\nChange-Id: I8c70a90fc10d8707b65e09ccddfe3acb984d3d92\n" }, { "commit": "3375c14aefe5479d452dc0fcaffa7e86460b230a", "tree": "e39238f0d7c31f450680838e504cefc8a19d285c", "parents": [ "d270842f22e22a47c0311690ca13c300b525a7f2", "5e8e47d4f8829cd7cb2e58bd1b6cb96e7c7cd1f1" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Aug 10 12:28:13 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:28:13 2018 -0700" }, "message": "Merge changes from topic \"back111085900\" into oc-dev am: f0095ec4d6\nam: 5e8e47d4f8\n\nChange-Id: I251eeddbbd73f0747920d757d6a210d0d5b772f5\n" }, { "commit": "d270842f22e22a47c0311690ca13c300b525a7f2", "tree": "c69e75448bd17a679dfd35dd76bbc871d83e91ee", "parents": [ "2adafa92bcbec4f9f2ef12051c755f9abbc503c7", "628667ac86032f4c5c6538bb868dd96d7c8e55ee" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 12:23:42 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:23:42 2018 -0700" }, "message": "DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 5a55a72fcd\nam: 628667ac86\n\nChange-Id: I8f8645a99e8b3bd07cd82722b8af888d46955030\n" }, { "commit": "2adafa92bcbec4f9f2ef12051c755f9abbc503c7", "tree": "6aebf6634786c73cb602f5540217e64795513974", "parents": [ "798655e2e114230ffa52e6017537cc026f29fc34", "efe1afbf93b328e96176b3becc888e457f95c0ed" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 12:20:08 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:20:08 2018 -0700" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f skipped: a2ad2596b7 am: 4ccfb1d0aa\nam: efe1afbf93\n\nChange-Id: I7ebe940777eba8ee575a0f970b462e447f241d53\n" }, { "commit": "798655e2e114230ffa52e6017537cc026f29fc34", "tree": "6aebf6634786c73cb602f5540217e64795513974", "parents": [ "130a2041e7d36ff2427b7d1754a5a25ae0a0ae01", "b2ed78a19765263a0553fc50a5f5cd0ce3c9382a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 12:12:07 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:12:07 2018 -0700" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209 am: ca5fd693bc skipped: 19d2af61df am: f5c1a7ca27\nam: b2ed78a197\n\nChange-Id: I695962bed5fdd932b434244a5c50d33dce34f08b\n" }, { "commit": "5e8e47d4f8829cd7cb2e58bd1b6cb96e7c7cd1f1", "tree": "1711674c75f4bd6c652947eabf0a342cb5588cbe", "parents": [ "628667ac86032f4c5c6538bb868dd96d7c8e55ee", "f0095ec4d67669bc4b0a68df8ef13deab4d94470" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Aug 10 11:12:36 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 11:12:36 2018 -0700" }, "message": "Merge changes from topic \"back111085900\" into oc-dev\nam: f0095ec4d6\n\nChange-Id: Ie563f7c17a201dadfe8a6696d2cf99aebc07b855\n" }, { "commit": "628667ac86032f4c5c6538bb868dd96d7c8e55ee", "tree": "46772ad20ee966f45f72b9e30ab5b8230f08cad4", "parents": [ "efe1afbf93b328e96176b3becc888e457f95c0ed", "5a55a72fcd18fb676eb4c114e62048068f71c01a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 11:05:51 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 11:05:51 2018 -0700" }, "message": "DO NOT MERGE. Execute \"strict\" queries with extra parentheses.\nam: 5a55a72fcd\n\nChange-Id: I4be4620726e30ca4131320bde074a2e572c51a42\n" }, { "commit": "efe1afbf93b328e96176b3becc888e457f95c0ed", "tree": "b16a5166e65241730eb58f3b4eab4228c5511c91", "parents": [ "b2ed78a19765263a0553fc50a5f5cd0ce3c9382a", "4ccfb1d0aa025163b404802c4731390846349be9" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 10:58:44 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 10:58:44 2018 -0700" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f skipped: a2ad2596b7\nam: 4ccfb1d0aa\n\nChange-Id: Iffccf38fd5e090757a2610d7b2cea6f9eacfb51b\n" }, { "commit": "b2ed78a19765263a0553fc50a5f5cd0ce3c9382a", "tree": "b16a5166e65241730eb58f3b4eab4228c5511c91", "parents": [ "1e4d88926f6ec3e9fb038afda888f709cd9bc845", "f5c1a7ca2778dbae675404ccc1e8a56b41d246ef" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 10:50:44 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 10:50:44 2018 -0700" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209 am: ca5fd693bc skipped: 19d2af61df\nam: f5c1a7ca27\n\nChange-Id: I931e17dba1218ea342f9ec0f17a8a8432e77fc20\n" }, { "commit": "3eef28d461b4fb20cd389f6eb6d620d1dfbbb221", "tree": "f519eb5d393862a22e3855f6f6c39b0a5c550457", "parents": [ "1f91ee3885620c96373335a9d4cdaa867126b412", "506994268bc4fa07d8798b7737a2952f74b8fd04" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Aug 10 17:26:54 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 10 17:26:54 2018 +0000" }, "message": "Merge changes from topic \"back111085900\" into pi-dev\n\n* changes:\n DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.\n DO NOT MERGE. Execute \"strict\" queries with extra parentheses.\n" }, { "commit": "f0095ec4d67669bc4b0a68df8ef13deab4d94470", "tree": "40dc1def99521358bda932d2b61c485f8196eff5", "parents": [ "4ccfb1d0aa025163b404802c4731390846349be9", "09d49531334ce6bc4ac45de1d3d0edb1495c0566" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Aug 10 17:26:54 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 10 17:26:54 2018 +0000" }, "message": "Merge changes from topic \"back111085900\" into oc-dev\n\n* changes:\n DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.\n DO NOT MERGE. Execute \"strict\" queries with extra parentheses.\n" }, { "commit": "1f91ee3885620c96373335a9d4cdaa867126b412", "tree": "e115a276ed8cc05ad5c8451f1272461355d258f9", "parents": [ "dfba41947b6fa22bf0451a92a3a26cf78038998f", "0ff9946abe9569808fb6b559aefb0c77f514c5ec" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 10 17:18:36 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 10 17:18:36 2018 +0000" }, "message": "Merge \"Pinner: Don\u0027t pin apps for work profile.\" into pi-dev" }, { "commit": "dfba41947b6fa22bf0451a92a3a26cf78038998f", "tree": "9c9ad88402d0eabc41701aabc1878943bcde82c5", "parents": [ "2df4d93b012c995d226121da944a677307eb5ef5", "3eab951217abbb2c1e77c3814bbe60c7b50fee26" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Fri Aug 10 08:32:57 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 10 08:32:57 2018 +0000" }, "message": "Merge \"DO NOT MERGE Log various information about non-foreground activity starts\" into pi-dev" }, { "commit": "0ff9946abe9569808fb6b559aefb0c77f514c5ec", "tree": "19579b747909b5cdbde736575867cd00c41cf4ba", "parents": [ "4deb5938085e0b1690450b5ed706e1a200899ba8" ], "author": { "name": "Carmen Jackson", "email": "carmenjackson@google.com", "time": "Thu Aug 09 14:51:39 2018 -0700" }, "committer": { "name": "Carmen Jackson", "email": "carmenjackson@google.com", "time": "Thu Aug 09 15:18:55 2018 -0700" }, "message": "Pinner: Don\u0027t pin apps for work profile.\n\nSince the Home and Camera intents aren\u0027t set to relevant apps for the\nwork profile, we don\u0027t want to pin those. However, the pinner will\ntrigger on boot for the work profile, after the primary profile has\npinned, and clear the currently pinned apps to try to pin the work\nprofile apps. This change skips rerunning the pinner for the work\nprofile.\n\nBug: 112357464\nTest: Added logging and tested device with a work profile. After reboot,\nsaw that the apps for the primary profile are pinned and the ones for\nthe work profile are not. Previously, apps for the work profile were\nattempted to be pinned.\nChange-Id: I0a7fdeab4287dcb6765c0fb47647ddc36db405b6\n" }, { "commit": "2df4d93b012c995d226121da944a677307eb5ef5", "tree": "e17507710b9111ebf98cfdac58ea60201f3dfaf1", "parents": [ "4db243a3db0879bb9734e6e3dea1fd661c8074b9", "f2043b4af5aac963d35c8248a2cec2d62bb7e1c4" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 09 22:03:33 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 09 22:03:33 2018 +0000" }, "message": "Merge \"Clarify WebViewClient.shouldOverrideUrlLoading docs\" into pi-dev" }, { "commit": "4db243a3db0879bb9734e6e3dea1fd661c8074b9", "tree": "4a6065794388965eb723e07b7e2ab2cc72367f2c", "parents": [ "5c7dd60026ac25d50bd793113ba05babadf21386" ], "author": { "name": "Howard Ro", "email": "yro@google.com", "time": "Tue Aug 07 15:44:25 2018 -0700" }, "committer": { "name": "Howard Ro", "email": "yro@google.com", "time": "Thu Aug 09 20:50:03 2018 +0000" }, "message": "Add a logging for ACTION_BAN_APP_NOTES\n\nBug: 111215354\nTest: adb logcat -b events\nChange-Id: I4e26adac7a7ad5053b919605b8a25e18bd93cac7\nMerged-In: I4e26adac7a7ad5053b919605b8a25e18bd93cac7\n" }, { "commit": "4ccfb1d0aa025163b404802c4731390846349be9", "tree": "9309ca9463eb4e7e8b6c313e34655b68c7d13d33", "parents": [ "f5c1a7ca2778dbae675404ccc1e8a56b41d246ef", "a2ad2596b7f95ac1782a8e85fe1278083326fa48" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:16:05 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:16:05 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f skipped: a2ad2596b7\n\nChange-Id: I18dbb198314da3b3722e5b0dfbd9f1dd1e203d4a\n" }, { "commit": "a2ad2596b7f95ac1782a8e85fe1278083326fa48", "tree": "11be29ed820ca56f0ba64348f4adca26cf5e7681", "parents": [ "19d2af61df39f568b37c0e976d5ea3322a70bc9a", "b2e2b1386fe5f1ae6cc3189ae4ea2d04f4bec583" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:16:00 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:16:00 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f\n\nChange-Id: Icdb977d8cb260d5210d103f306de550b3f8fed96\n" }, { "commit": "b2e2b1386fe5f1ae6cc3189ae4ea2d04f4bec583", "tree": "62f202408135941f1babfbcc1741660af1c93c38", "parents": [ "ca5fd693bc7eef0488af259a1fe4f2a60870c0c3", "424304f893f0c803563194b092b384dc17c23f96" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:55 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:55 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893\n\nChange-Id: I4c0f715b12df5e7ffb4f3a1b7cf9ae5da4be22ca\n" }, { "commit": "424304f893f0c803563194b092b384dc17c23f96", "tree": "3a2f1af1772db80e868c9e399d464998e4ef6a6a", "parents": [ "97d0d2c209d528d27083d880fa8ee2cdedc4fbd2", "c09bb997e8d5d48ee33bcb7949bf603ff9b455a1" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:51 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:51 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8\n\nChange-Id: I544bf2c6b5d0177aa70a6fb7bd4225d4d04881fd\n" }, { "commit": "c09bb997e8d5d48ee33bcb7949bf603ff9b455a1", "tree": "a11dc7ca8647c4afa051aa9b0f0498299ede6181", "parents": [ "8ecd22c0a4d790baeee6ca3d575aff8f29f2357b", "8e95967f092b4ffa593861452e55621b4e528acf" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:45 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:45 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09\n\nChange-Id: I6cdb5a5dd5531ad53ef02174ff5063788d11029d\n" }, { "commit": "f5c1a7ca2778dbae675404ccc1e8a56b41d246ef", "tree": "9309ca9463eb4e7e8b6c313e34655b68c7d13d33", "parents": [ "05519b7e3d0f3d16ddfe6ee3892c8468a2c10c62", "19d2af61df39f568b37c0e976d5ea3322a70bc9a" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:44 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:44 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209 am: ca5fd693bc skipped: 19d2af61df\n\nChange-Id: I66ddfbffbec736061780c86c9c9e542fe2a200ba\n" }, { "commit": "19d2af61df39f568b37c0e976d5ea3322a70bc9a", "tree": "ae7f75cbe1be7cbc5910c2adbdba39d8087fa0ea", "parents": [ "cfc6d8607e2b3f4b7c91eba5e20e5c6cc16de91f", "ca5fd693bc7eef0488af259a1fe4f2a60870c0c3" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:39 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:39 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209 am: ca5fd693bc\n\nChange-Id: Iccacb48d382a3fd8012dff81c3d8482afe0e5f14\n" }, { "commit": "ca5fd693bc7eef0488af259a1fe4f2a60870c0c3", "tree": "ba430602de9f7e4b01c6c7dd05eaa48f32cfab03", "parents": [ "23162a8897fe2cefa0e090ba7785adc75cc10c67", "97d0d2c209d528d27083d880fa8ee2cdedc4fbd2" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:33 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:33 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209\n\nChange-Id: I92820ffe7b45077bc4beaf97144a7b7eb3117af0\n" }, { "commit": "97d0d2c209d528d27083d880fa8ee2cdedc4fbd2", "tree": "ddc5c4df03406d8c70953751ddddec0440704fc3", "parents": [ "1bce1217ca17267c54e0960c203a9336d0e697e2", "8ecd22c0a4d790baeee6ca3d575aff8f29f2357b" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:28 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:28 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4\n\nChange-Id: Ia9f489c55def0f592383ac2a10f5bd0b34c2663d\n" }, { "commit": "8ecd22c0a4d790baeee6ca3d575aff8f29f2357b", "tree": "9af48301eefbaaf3283c6b8714c71acf75333b1c", "parents": [ "00b57fc9b76819db3a2ca365a6c6e1ff8e114636", "286fd5652a9804bfd185980dc07ad239e1169929" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:19 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:19 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a\n\nChange-Id: Ia877305c642c3b7741941d2e438fe77f1d1550f3\n" }, { "commit": "3eab951217abbb2c1e77c3814bbe60c7b50fee26", "tree": "ace567e3e653e85621f178d4d24f2a3623c1c855", "parents": [ "5c7dd60026ac25d50bd793113ba05babadf21386" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Fri Jul 20 15:32:00 2018 +0100" }, "committer": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Thu Aug 09 15:18:07 2018 +0100" }, "message": "DO NOT MERGE Log various information about non-foreground activity starts\n\nLogging activity starts to TRON, but only if the caller app\ndoesn\u0027t have any foreground activity present.\n\nExample event:\n08-03 15:21:30.813 1231 3220 I sysui_multi_action: [757,1513,758,4,805,1533306090812,1514,10147,1515,com.google.android.talk,1516,1018,1517,0,1518,1000,1519,1000,1520,0,1521,10147,1522,com.google.android.talk,1523,1018,1524,0,1525,pendingintent:u0a12:com.google.android.talk/com.google.android.apps.hangouts.phone.ConversationActivity,1526,com.google.android.talk/com.google.android.apps.hangouts.phone.BabelHomeActivity,1527,1,1528,com.google.android.apps.hangouts.phone.conversationlist,1540,1,1541,com.google.android.apps.hangouts.phone.BabelHomeActivity,1542,3146240,1543,{com.google.android.talk/com.google.android.apps.hangouts.phone.BabelHomeActivity},1544,com.google.android.talk/com.google.android.apps.hangouts.phone.BabelHomeActivity,1545,com.google.android.talk,1546,1,1547,0,1551,0,1552,0]\n\n(cherry-picked from 201bc0c14e9e2c5d868fa5acff7edc3e8cc0f6b7)\n\nBug: b/111866309\nContext: go/activity-starts-logging-tron\nTest: 1) enable logging with: adb shell settings put global activity_starts_logging_enabled 1\n 2) open some activities and observe: adb logcat -b events | grep \"sysui_multi_action: \\[757,1513\"\nTest: atest FrameworksServicesTests:ActivityStarterTests\n\nChange-Id: Ie7dee51c574e544d12e83d279afda46b336f2013\n" }, { "commit": "8046ba6ef327597e573a6af33e51893f3fb59309", "tree": "ff5b0ceed216748222e12ddafbfe311843b3b379", "parents": [ "0b9a87c661bcbca2f78dfe59ad0a9b131cfd680c" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Wed Aug 08 18:16:22 2018 -0700" }, "committer": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Wed Aug 08 18:20:36 2018 -0700" }, "message": "Sending BATTERY_LEVEL_CHANGED when plug type changes\n\nTest: manual:\nadb shell dumpsys battery unplug|reset\nshould trigger the broadcast\n\nBug: 112322475\nChange-Id: I16b13274100903cb738a047c76d25cf30e480b88\n" }, { "commit": "5c7dd60026ac25d50bd793113ba05babadf21386", "tree": "6b0f2441c1a537aa3130ad1d5e4af13477c0b5c1", "parents": [ "71b35bceddbafe494e1a3788d25dbcd9a39518d8", "130a2041e7d36ff2427b7d1754a5a25ae0a0ae01" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Aug 08 18:15:26 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 08 18:15:26 2018 -0700" }, "message": "[automerger skipped] DO NOT MERGE. Persistable Uri grants still require permissions. am: 05519b7e3d am: 1e4d88926f\nam: 130a2041e7 -s ours\n\nChange-Id: I71aecf8896fc494a75bd222e8c146ebce3654d53\n" }, { "commit": "130a2041e7d36ff2427b7d1754a5a25ae0a0ae01", "tree": "6aebf6634786c73cb602f5540217e64795513974", "parents": [ "b9504e591a668b6151a33c04cea6d0421c20d5b8", "1e4d88926f6ec3e9fb038afda888f709cd9bc845" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Aug 08 17:53:03 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 08 17:53:03 2018 -0700" }, "message": "DO NOT MERGE. Persistable Uri grants still require permissions. am: 05519b7e3d\nam: 1e4d88926f\n\nChange-Id: I267a65ad3c2e73b697f832059567f4f2c2438792\n" }, { "commit": "1e4d88926f6ec3e9fb038afda888f709cd9bc845", "tree": "b16a5166e65241730eb58f3b4eab4228c5511c91", "parents": [ "c93b474752483e7e99e63709f8511ca76c235680", "05519b7e3d0f3d16ddfe6ee3892c8468a2c10c62" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Aug 08 17:23:00 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 08 17:23:00 2018 -0700" }, "message": "DO NOT MERGE. Persistable Uri grants still require permissions.\nam: 05519b7e3d\n\nChange-Id: I6d42f089fec6c268b35885d3169644853ab734c5\n" }, { "commit": "71b35bceddbafe494e1a3788d25dbcd9a39518d8", "tree": "6b0f2441c1a537aa3130ad1d5e4af13477c0b5c1", "parents": [ "fd2458518271f1c442733003d00a2ff1373f9fb9", "d6a6e7127cc341ca875d9d13cf7a864d9f20b479" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Thu Aug 09 00:06:30 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 09 00:06:30 2018 +0000" }, "message": "Merge \"DO NOT MERGE. Persistable Uri grants still require permissions.\" into pi-dev" }, { "commit": "f2043b4af5aac963d35c8248a2cec2d62bb7e1c4", "tree": "9511ae7c9d933c1fe938a0ef864d628d789e18d9", "parents": [ "fd2458518271f1c442733003d00a2ff1373f9fb9" ], "author": { "name": "Paul Miller", "email": "paulmiller@google.com", "time": "Wed Jul 25 18:11:26 2018 -0700" }, "committer": { "name": "Nate Fischer", "email": "ntfschr@google.com", "time": "Wed Aug 08 21:56:31 2018 +0000" }, "message": "Clarify WebViewClient.shouldOverrideUrlLoading docs\n\nCall out more explicitly the antipattern of calling loadUrl with the\nsame URL and returning true, and repeat this on the deprecated version.\nSimplify the wording about returning true v.s. false. Switch to the\n\"note\" style used elsewhere on the page.\n\nBUG:111843379\nChange-Id: I36c31a8e0f4754c314b8a4d72cc497c9c3a3e242\nTest: make docs\n(cherry picked from commit 3819a6467b984119fd48ac54ae9a24d59e9ade95)\n" }, { "commit": "fd2458518271f1c442733003d00a2ff1373f9fb9", "tree": "a9b758831393c65c47b4935c4ece5d6e6b5db9f1", "parents": [ "97229ed3e8090c2f5cd3eabe6df5bcf841b832c1", "a04c80089d75a52bb52a8ad6517be98258d41c0c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 08 00:04:41 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 08 00:04:41 2018 +0000" }, "message": "Merge \"Fix to mark disableApkUnlessMatchedSku hidden for all users\" into pi-dev" }, { "commit": "d6a6e7127cc341ca875d9d13cf7a864d9f20b479", "tree": "89c97ce5163f1fc94d7bf5190f137f30fce00fba", "parents": [ "97229ed3e8090c2f5cd3eabe6df5bcf841b832c1" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Aug 07 15:02:17 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Tue Aug 07 22:26:00 2018 +0000" }, "message": "DO NOT MERGE. Persistable Uri grants still require permissions.\n\nWhen FLAG_GRANT_PERSISTABLE_URI_PERMISSION is requested, we still\nneed to check permissions between the source and target packages,\ninstead of shortcutting past them.\n\nThe spirit of the original change is remains intact: if the caller\nrequested FLAG_GRANT_PERSISTABLE_URI_PERMISSION, then we avoid\nreturning \"-1\", which would prevent the grant data structure from\nbeing allocated.\n\nBug: 111934948\nTest: atest android.appsecurity.cts.AppSecurityTests\nChange-Id: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030\nMerged-In: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030\n" }, { "commit": "05519b7e3d0f3d16ddfe6ee3892c8468a2c10c62", "tree": "9309ca9463eb4e7e8b6c313e34655b68c7d13d33", "parents": [ "515700b4feb35ac615c8ca38165f629a67c4d99f" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Aug 07 15:02:17 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Tue Aug 07 22:25:13 2018 +0000" }, "message": "DO NOT MERGE. Persistable Uri grants still require permissions.\n\nWhen FLAG_GRANT_PERSISTABLE_URI_PERMISSION is requested, we still\nneed to check permissions between the source and target packages,\ninstead of shortcutting past them.\n\nThe spirit of the original change is remains intact: if the caller\nrequested FLAG_GRANT_PERSISTABLE_URI_PERMISSION, then we avoid\nreturning \"-1\", which would prevent the grant data structure from\nbeing allocated.\n\nBug: 111934948\nTest: atest android.appsecurity.cts.AppSecurityTests\nChange-Id: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030\nMerged-In: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030\n" }, { "commit": "a04c80089d75a52bb52a8ad6517be98258d41c0c", "tree": "98663434ca46a033bc06cebe90393b46277912ba", "parents": [ "f8f459a2cc3e0abb88323fa08243c302998deb6c" ], "author": { "name": "Ruchi Kandoi", "email": "kandoiruchi@google.com", "time": "Fri Aug 03 11:05:41 2018 -0700" }, "committer": { "name": "Ruchi Kandoi", "email": "kandoiruchi@google.com", "time": "Tue Aug 07 14:49:46 2018 -0700" }, "message": "Fix to mark disableApkUnlessMatchedSku hidden for all users\n\nBug: 111795497\nTest: manual; switch to guest \u0026 secondary user\nChange-Id: I8ba64f52953b8a86adaea343ed52eaa6865a0019\n" }, { "commit": "97229ed3e8090c2f5cd3eabe6df5bcf841b832c1", "tree": "4e235fc96ef44b5ef8654364e7f30088ce3d6f1d", "parents": [ "8f938095b4a5f1b8734a1032ea4b2f251a33f2cd", "a861ff7a6479d86a651fb92118ef3b68b49429e2" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Tue Aug 07 18:49:47 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 07 18:49:47 2018 +0000" }, "message": "Merge \"docs: Adding links to \"about version\" pages\" into pi-dev" }, { "commit": "8f938095b4a5f1b8734a1032ea4b2f251a33f2cd", "tree": "3975c79e1567921c10a9e14298b0b92e46344d24", "parents": [ "4deb5938085e0b1690450b5ed706e1a200899ba8", "2ea8e0b31faab0e59e92f2c8bb8a73022de2ebd5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 07 18:20:16 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 07 18:20:16 2018 +0000" }, "message": "Merge \"wifi.proto: Add metric for installed passpoint profile type\" into pi-dev" }, { "commit": "a861ff7a6479d86a651fb92118ef3b68b49429e2", "tree": "dab3a7bca45a4a54b39cf6c40477f7b225ee9704", "parents": [ "a7a496f3a14ffb467257286da2bfe0056091e83b" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Mon Aug 06 13:43:30 2018 -0700" }, "committer": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Mon Aug 06 16:13:10 2018 -0700" }, "message": "docs: Adding links to \"about version\" pages\n\nFor the various Build.VERSION_CODES.\u003cversion_name\u003e constants, adding\na link to the appropriate \"about this release\" page in\n/about/versions/ , if there is one.\n\nStaged doc to:\nhttp://go/dac-stage/reference/android/os/Build.VERSION_CODES\n\nBug: 80546406\nTest: make ds-docs\nChange-Id: If363445c938d325172da6beeed25e821121c5539\n" }, { "commit": "4deb5938085e0b1690450b5ed706e1a200899ba8", "tree": "f17836b04387225e66fd7560f3bb4a47d8f8b80a", "parents": [ "a7a496f3a14ffb467257286da2bfe0056091e83b", "e6e6ec4849a1bffec6e7bf993500b8ed533cd87c" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Mon Aug 06 22:57:35 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 06 22:57:35 2018 +0000" }, "message": "Merge \"Don\u0027t insert certain numbers into the call log\" into pi-dev" }, { "commit": "e6e6ec4849a1bffec6e7bf993500b8ed533cd87c", "tree": "e5427f287540208900d26adf500b7ecdaf5ce889", "parents": [ "b0e3c67824cd68812ca0dd92bc84358c6a57c733" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Aug 03 18:25:24 2018 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Mon Aug 06 11:33:46 2018 -0700" }, "message": "Don\u0027t insert certain numbers into the call log\n\nFor regulatory requirements, prevent certain sensitive numbers from\nbeing logged in the call log. The numbers can either be specified in the\ncarrier config or in the mcc config for the device.\n\nBug: 111470439\nTest: unit, manual\nChange-Id: Icc4db12def802c2ce5485422a0ec199e3e7452fa\n" }, { "commit": "a7a496f3a14ffb467257286da2bfe0056091e83b", "tree": "e4e91cd971ad57453af3712d7f43e8fb45376443", "parents": [ "e85115fdb7737516dcbb5d164ae94d35dcea8747", "64439c1e8c93d9e929f2f9d901d1f523bc060aaf" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Aug 06 17:25:48 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 06 17:25:48 2018 +0000" }, "message": "Merge \"No disclaimer when switching profile for system SMS and dialer apps.\" into pi-dev" }, { "commit": "e85115fdb7737516dcbb5d164ae94d35dcea8747", "tree": "e1760476c917c724cef1265ee24691e5c4433b8b", "parents": [ "f8f459a2cc3e0abb88323fa08243c302998deb6c", "08bd163e2db8c7e073a3d633cbf4cb0f53fe3c14" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sat Aug 04 23:06:05 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 04 23:06:05 2018 +0000" }, "message": "Merge \"Camera: Documentation updates for calibration and distortion correction\" into pi-dev" }, { "commit": "506994268bc4fa07d8798b7737a2952f74b8fd04", "tree": "c33d6f062f8f0ee2cb2092221193981658f5c38e", "parents": [ "57b04a86802ff879af78e782a8582462323e34e7" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 25 14:52:14 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 03 13:43:44 2018 -0600" }, "message": "DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.\n\nDevelopers often accept selection clauses from untrusted code, and\nSQLiteQueryBuilder already supports a \"strict\" mode to help catch\nSQL injection attacks. This change extends the builder to support\nupdate() and delete() calls, so that we can help secure those\nselection clauses too.\n\nBug: 111085900\nTest: atest packages/providers/DownloadProvider/tests/\nTest: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java\nTest: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java\nChange-Id: Ib4fc8400f184755ee7e971ab5f2095186341730c\nMerged-In: Ib4fc8400f184755ee7e971ab5f2095186341730c\n" }, { "commit": "57b04a86802ff879af78e782a8582462323e34e7", "tree": "f309b0b03ae9e30ed576b6dc7856ff5fbcdceac9", "parents": [ "ae3f6561466542804aa69e7e2dcecedf37c20511" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 25 14:01:59 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 03 13:43:40 2018 -0600" }, "message": "DO NOT MERGE. Execute \"strict\" queries with extra parentheses.\n\nSQLiteQueryBuilder has a setStrict() mode which can be used to\ndetect SQL attacks from untrusted sources, which it does by running\neach query twice: once with an extra set of parentheses, and if that\nsucceeds, it runs the original query verbatim.\n\nThis sadly doesn\u0027t catch inputs of the type \"1\u003d1) OR (1\u003d1\", which\ncreates valid statements for both tests above, but the final executed\nquery ends up leaking data due to SQLite operator precedence.\n\nInstead, we need to continue compiling both variants, but we need\nto execute the query with the additional parentheses to ensure\ndata won\u0027t be leaked.\n\nTest: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java\nBug: 111085900\nChange-Id: I6e8746fa48f9de13adae37d2990de11c9c585381\nMerged-In: I6e8746fa48f9de13adae37d2990de11c9c585381\n" }, { "commit": "09d49531334ce6bc4ac45de1d3d0edb1495c0566", "tree": "29392ed3305ab843440b5a8b3d5d861e06c93e9b", "parents": [ "5a55a72fcd18fb676eb4c114e62048068f71c01a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 25 14:52:14 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 03 13:43:22 2018 -0600" }, "message": "DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.\n\nDevelopers often accept selection clauses from untrusted code, and\nSQLiteQueryBuilder already supports a \"strict\" mode to help catch\nSQL injection attacks. This change extends the builder to support\nupdate() and delete() calls, so that we can help secure those\nselection clauses too.\n\nBug: 111085900\nTest: atest packages/providers/DownloadProvider/tests/\nTest: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java\nTest: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java\nChange-Id: Ib4fc8400f184755ee7e971ab5f2095186341730c\nMerged-In: Ib4fc8400f184755ee7e971ab5f2095186341730c\n" }, { "commit": "5a55a72fcd18fb676eb4c114e62048068f71c01a", "tree": "081d88076aaf173759279cfc187bd60f4b982c04", "parents": [ "515700b4feb35ac615c8ca38165f629a67c4d99f" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 25 14:01:59 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 03 13:43:16 2018 -0600" }, "message": "DO NOT MERGE. Execute \"strict\" queries with extra parentheses.\n\nSQLiteQueryBuilder has a setStrict() mode which can be used to\ndetect SQL attacks from untrusted sources, which it does by running\neach query twice: once with an extra set of parentheses, and if that\nsucceeds, it runs the original query verbatim.\n\nThis sadly doesn\u0027t catch inputs of the type \"1\u003d1) OR (1\u003d1\", which\ncreates valid statements for both tests above, but the final executed\nquery ends up leaking data due to SQLite operator precedence.\n\nInstead, we need to continue compiling both variants, but we need\nto execute the query with the additional parentheses to ensure\ndata won\u0027t be leaked.\n\nTest: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java\nBug: 111085900\nChange-Id: I6e8746fa48f9de13adae37d2990de11c9c585381\nMerged-In: I6e8746fa48f9de13adae37d2990de11c9c585381\n" }, { "commit": "8e95967f092b4ffa593861452e55621b4e528acf", "tree": "e84142caef234584e829867241c7d0878c3850cd", "parents": [ "286fd5652a9804bfd185980dc07ad239e1169929" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 25 14:52:14 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 03 13:42:35 2018 -0600" }, "message": "DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.\n\nDevelopers often accept selection clauses from untrusted code, and\nSQLiteQueryBuilder already supports a \"strict\" mode to help catch\nSQL injection attacks. This change extends the builder to support\nupdate() and delete() calls, so that we can help secure those\nselection clauses too.\n\nBug: 111085900\nTest: atest packages/providers/DownloadProvider/tests/\nTest: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java\nTest: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java\nChange-Id: Ib4fc8400f184755ee7e971ab5f2095186341730c\nMerged-In: Ib4fc8400f184755ee7e971ab5f2095186341730c\n" }, { "commit": "286fd5652a9804bfd185980dc07ad239e1169929", "tree": "6b97158a00a964cbfaa1667a80fc08f16114199a", "parents": [ "b794b4cb9e5c541ef6142f689bcbe70aa56829f5" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 25 14:01:59 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 03 13:38:31 2018 -0600" }, "message": "DO NOT MERGE. Execute \"strict\" queries with extra parentheses.\n\nSQLiteQueryBuilder has a setStrict() mode which can be used to\ndetect SQL attacks from untrusted sources, which it does by running\neach query twice: once with an extra set of parentheses, and if that\nsucceeds, it runs the original query verbatim.\n\nThis sadly doesn\u0027t catch inputs of the type \"1\u003d1) OR (1\u003d1\", which\ncreates valid statements for both tests above, but the final executed\nquery ends up leaking data due to SQLite operator precedence.\n\nInstead, we need to continue compiling both variants, but we need\nto execute the query with the additional parentheses to ensure\ndata won\u0027t be leaked.\n\nTest: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java\nBug: 111085900\nChange-Id: I6e8746fa48f9de13adae37d2990de11c9c585381\nMerged-In: I6e8746fa48f9de13adae37d2990de11c9c585381\n" }, { "commit": "f8f459a2cc3e0abb88323fa08243c302998deb6c", "tree": "02aa462dc4d73d1569937fbac4e2118f8a0e88b8", "parents": [ "9d80381ad8b4217a42ff47f2161d8ba95e407701", "d967f8210c2a9d969ace3e7c1e4ef8595ceb97b1" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 02 22:36:10 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 02 22:36:10 2018 +0000" }, "message": "Merge \"Do not restart tethering while enabling tethering.\" into pi-dev" }, { "commit": "08bd163e2db8c7e073a3d633cbf4cb0f53fe3c14", "tree": "2a823255687ca163140ad56bf46f43db5691c439", "parents": [ "ae3f6561466542804aa69e7e2dcecedf37c20511" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Aug 01 17:23:09 2018 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 14:43:44 2018 -0700" }, "message": "Camera: Documentation updates for calibration and distortion correction\n\n- Add more notes on coordinate axes\n- Add more text on metadata when distortion correction is active\n- Note that poseTranslation needs to be negated in many use cases\n- Fix coordinate system references for OIS reporting, add more information\n- Note that pixel centers at half-integers for the camera API metadata\n such as lens intrinsics\n\nBug: 79371566\nBug: 74434422\nBug: 109742048\nBug: 109834325\nBug: 109817371\nBug: 112107924\nTest: Manual reading of added text\nChange-Id: I450e80b79ef66ce8d82a4dee835db6abd1e598a3\n" }, { "commit": "64439c1e8c93d9e929f2f9d901d1f523bc060aaf", "tree": "cd6f9590096ff137a3a1bbab71e931742fa23a62", "parents": [ "614e26dbcba08f0a10ae97293c4bc45622556e0e" ], "author": { "name": "arangelov", "email": "arangelov@google.com", "time": "Tue Jul 31 14:18:47 2018 +0100" }, "committer": { "name": "arangelov", "email": "arangelov@google.com", "time": "Thu Aug 02 14:52:30 2018 +0100" }, "message": "No disclaimer when switching profile for system SMS and dialer apps.\n\nThis CL prevents the Toast message from showing when the following\nconditions are met:\n1. App is system app\n2. Intent action is either ACTION_DIAL or ACTION_CALL or if it is\nACTION_SENDTO, only skip if data scheme is one of \"sms:\", \"smsto:\",\n\"mms:\" or \"mmsto:\".\n\nBug: 111228250\nTest: atest FrameworksCoreTests:IntentForwarderActivityTest\nChange-Id: Idef71ff2928e9e3d72bad4ba8ff17f9306e91d25\n" }, { "commit": "9d80381ad8b4217a42ff47f2161d8ba95e407701", "tree": "05271e893bdbaa1c0dab5727e69b9a64cc45814d", "parents": [ "ae3f6561466542804aa69e7e2dcecedf37c20511", "e3834650856c0a49b543b3757a4370a68fe57ac6" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 01 23:19:52 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 01 23:19:52 2018 +0000" }, "message": "Merge \"Set initial KSV state after inflation\" into pi-dev" }, { "commit": "d967f8210c2a9d969ace3e7c1e4ef8595ceb97b1", "tree": "5442c66d9ddd8e4f2702fb107be079236818b4b7", "parents": [ "ae3f6561466542804aa69e7e2dcecedf37c20511" ], "author": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Tue Jun 19 17:58:35 2018 -0400" }, "committer": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Wed Aug 01 22:41:00 2018 +0000" }, "message": "Do not restart tethering while enabling tethering.\n\nChange-Id: I64194cfbcf830d867593681ab960fea0213ef24a\nFixes: 110303540\nTest: manual\n(cherry picked from commit aa4735f69c2009128fe38823040a2037ebe577c5)\n" }, { "commit": "ae3f6561466542804aa69e7e2dcecedf37c20511", "tree": "49257d78460a90315659abeea9e021d43c198a96", "parents": [ "63e36667da78e6edc0959e05e1c8cdf461dac8ef", "e27c3511d8720bfb00feda5fcc9fb7204d98f586" ], "author": { "name": "Laura Davis", "email": "laurabd@google.com", "time": "Wed Aug 01 17:47:04 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 01 17:47:04 2018 +0000" }, "message": "Merge \"Docs: fixed typo and made minor edits\" into pi-dev" }, { "commit": "63e36667da78e6edc0959e05e1c8cdf461dac8ef", "tree": "57df29d4072ef3239a7178004a92330825f1fc4d", "parents": [ "614e26dbcba08f0a10ae97293c4bc45622556e0e", "42d27af0daf4c01022e4c6466d81f7fb6ff18191" ], "author": { "name": "Laura Davis", "email": "laurabd@google.com", "time": "Wed Aug 01 17:46:37 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 01 17:46:37 2018 +0000" }, "message": "Merge \"Docs: fixed typo\" into pi-dev" }, { "commit": "2ea8e0b31faab0e59e92f2c8bb8a73022de2ebd5", "tree": "a0d6d3d6bc5104e7e339d8dbdc834e0b57c22b3f", "parents": [ "614e26dbcba08f0a10ae97293c4bc45622556e0e" ], "author": { "name": "Ecco Park", "email": "eccopark@google.com", "time": "Mon Jul 23 15:53:10 2018 -0700" }, "committer": { "name": "Ecco Park", "email": "eccopark@google.com", "time": "Tue Jul 31 13:56:40 2018 -0700" }, "message": "wifi.proto: Add metric for installed passpoint profile type\n\nBug: 111473296\nTest: Unit Tests\n\nMerged-In: Ia6c6641697ecea1a51d7931d5f0f5b25963ae198\nChange-Id: Ia6c6641697ecea1a51d7931d5f0f5b25963ae198\nSigned-off-by: Ecco Park \u003ceccopark@google.com\u003e\n" }, { "commit": "e27c3511d8720bfb00feda5fcc9fb7204d98f586", "tree": "6028d5198fa998c04ae1391594675ed8b1d8c233", "parents": [ "614e26dbcba08f0a10ae97293c4bc45622556e0e" ], "author": { "name": "Laura Davis", "email": "laurabd@google.com", "time": "Thu Jul 26 15:21:45 2018 -0700" }, "committer": { "name": "Laura Davis", "email": "laurabd@google.com", "time": "Mon Jul 30 14:56:32 2018 -0700" }, "message": "Docs: fixed typo and made minor edits\n\nTest: make ds-docs\n\nBug: 111734031\nBug: 111734470\nChange-Id: Ic120368fef0c0673ce954cdf0927a4705b3edcd2\n" }, { "commit": "614e26dbcba08f0a10ae97293c4bc45622556e0e", "tree": "7b9e45c2f46e9790d99291b235a552c942d1fd04", "parents": [ "69556e89f308d22c57fc8ecf45f9445d471c7cc7", "259ca36bb0f5e1060af63e2fa331af15964ebc12" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 30 17:16:20 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 30 17:16:20 2018 +0000" }, "message": "Merge \"Work profile without password shouldn\u0027t be locked.\" into pi-dev" }, { "commit": "69556e89f308d22c57fc8ecf45f9445d471c7cc7", "tree": "47c1465b963fefd38bd925b6802e8e50a5614a59", "parents": [ "f5940ac5283dcb6848443455b50e79dc6bd7b146", "b9504e591a668b6151a33c04cea6d0421c20d5b8" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 23:32:29 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 23:32:29 2018 -0700" }, "message": "Merge changes from topic \"am-c65d7988-0ca0-4757-9d9c-21f4575eec01\" into oc-dev am: 515700b4fe am: c93b474752\nam: b9504e591a\n\nChange-Id: I2b24a15f259b6c587e9bfc4fa01b4a8aa888f75a\n" }, { "commit": "f5940ac5283dcb6848443455b50e79dc6bd7b146", "tree": "47c1465b963fefd38bd925b6802e8e50a5614a59", "parents": [ "105d24717fc5aec581299f7a0d9d2e90a7bf0bab", "ff99070f7858d1c45d1f6822c936efe7ad875e73" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 23:24:16 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 23:24:16 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb am: 976bb372c3 -s ours am: 27c3ba01ff -s ours\nam: ff99070f78 -s ours\n\nChange-Id: I52d966e5fe7a7e6d0c3ee6c0df4d424c0d7f59ff\n" }, { "commit": "b9504e591a668b6151a33c04cea6d0421c20d5b8", "tree": "81be9b132b330d655618477fd2c6dcec762e8c58", "parents": [ "ff99070f7858d1c45d1f6822c936efe7ad875e73", "c93b474752483e7e99e63709f8511ca76c235680" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 23:04:31 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 23:04:31 2018 -0700" }, "message": "Merge changes from topic \"am-c65d7988-0ca0-4757-9d9c-21f4575eec01\" into oc-dev am: 515700b4fe\nam: c93b474752\n\nChange-Id: I94c7b1d7e9bda726390fc5ceba62f8286a06bc42\n" }, { "commit": "105d24717fc5aec581299f7a0d9d2e90a7bf0bab", "tree": "47c1465b963fefd38bd925b6802e8e50a5614a59", "parents": [ "424d01398b00e26fbd04a2a738236f6f42883312", "ab2d9d3e3753886c4ab2157ebfbba655038e89c5" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:59:05 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:59:05 2018 -0700" }, "message": "Merge changes from topic \"am-1155d171-2145-4903-8420-80ecfd6c6b08\" into oc-dev am: d0025407df am: 0834c94a93\nam: ab2d9d3e37\n\nChange-Id: Ib76a04e7bab429bbdcfee69bb0240feaf154d1d2\n" }, { "commit": "ff99070f7858d1c45d1f6822c936efe7ad875e73", "tree": "81be9b132b330d655618477fd2c6dcec762e8c58", "parents": [ "ab2d9d3e3753886c4ab2157ebfbba655038e89c5", "27c3ba01ff9f08abc56beca2b86d5322c14bfc04" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:58:06 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:58:06 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb am: 976bb372c3 -s ours\nam: 27c3ba01ff -s ours\n\nChange-Id: Id3d12a61dbf1a9e7eeabf1c12c39b8aa43ffe52b\n" }, { "commit": "424d01398b00e26fbd04a2a738236f6f42883312", "tree": "47c1465b963fefd38bd925b6802e8e50a5614a59", "parents": [ "dce81b39c751110277d7d33447c1de6a3740bed8", "3b822cd07776d06b3166541837fa109e630431bb" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:51:02 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:51:02 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637 am: 70ebabc63d -s ours am: 786ae0d322 -s ours\nam: 3b822cd077 -s ours\n\nChange-Id: I50130dce613f0c7e4a596ea9dcde87de43d02fc6\n" }, { "commit": "ab2d9d3e3753886c4ab2157ebfbba655038e89c5", "tree": "81be9b132b330d655618477fd2c6dcec762e8c58", "parents": [ "3b822cd07776d06b3166541837fa109e630431bb", "0834c94a931a9ede373ce822b3cebf02f029adfb" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:46:54 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:46:54 2018 -0700" }, "message": "Merge changes from topic \"am-1155d171-2145-4903-8420-80ecfd6c6b08\" into oc-dev am: d0025407df\nam: 0834c94a93\n\nChange-Id: I82eb8a2dfab9d3ce1d7b8de91950d9c2069da2db\n" }, { "commit": "c93b474752483e7e99e63709f8511ca76c235680", "tree": "390d01b43e3cc453bee765893ecb41807ac4d77c", "parents": [ "27c3ba01ff9f08abc56beca2b86d5322c14bfc04", "515700b4feb35ac615c8ca38165f629a67c4d99f" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:43:33 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:43:33 2018 -0700" }, "message": "Merge changes from topic \"am-c65d7988-0ca0-4757-9d9c-21f4575eec01\" into oc-dev\nam: 515700b4fe\n\nChange-Id: I0f58a9fe2bb437e8caf854b4ca8f5c4bc0f10c7d\n" }, { "commit": "27c3ba01ff9f08abc56beca2b86d5322c14bfc04", "tree": "390d01b43e3cc453bee765893ecb41807ac4d77c", "parents": [ "0834c94a931a9ede373ce822b3cebf02f029adfb", "976bb372c3b70d37f5336c32faeca09df524f5c2" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:41:40 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:41:40 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb\nam: 976bb372c3 -s ours\n\nChange-Id: I971275a90e048fec4861d2e866ec53c5d1b0a356\n" }, { "commit": "3b822cd07776d06b3166541837fa109e630431bb", "tree": "81be9b132b330d655618477fd2c6dcec762e8c58", "parents": [ "acdedf312261339dee722d9c2a984703e163bf8e", "786ae0d32260c0c42c13b4cc3cf07ef9ccc92494" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:40:28 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:40:28 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637 am: 70ebabc63d -s ours\nam: 786ae0d322 -s ours\n\nChange-Id: I1a741c23da3317c1b711a1a58cbf23bc4e97837e\n" }, { "commit": "dce81b39c751110277d7d33447c1de6a3740bed8", "tree": "47c1465b963fefd38bd925b6802e8e50a5614a59", "parents": [ "11768fd80fe62e66df0651b3301315afeb234abb", "acdedf312261339dee722d9c2a984703e163bf8e" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:22:52 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:22:52 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f am: 843fb76d1f -s ours am: ffe456e49c -s ours\nam: acdedf3122 -s ours\n\nChange-Id: I61f0ab91a21552f0dc61c7173a971aa07bef88aa\n" }, { "commit": "acdedf312261339dee722d9c2a984703e163bf8e", "tree": "81be9b132b330d655618477fd2c6dcec762e8c58", "parents": [ "64cb4be88784d5f48da7092a8772c01e82a2b43e", "ffe456e49c1ecd4a2220b8c6cd96610386a6a7c7" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:19:49 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:19:49 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f am: 843fb76d1f -s ours\nam: ffe456e49c -s ours\n\nChange-Id: Ifc2aceed944b28d1a9d923f01eb92ab374d67d6b\n" }, { "commit": "0834c94a931a9ede373ce822b3cebf02f029adfb", "tree": "390d01b43e3cc453bee765893ecb41807ac4d77c", "parents": [ "786ae0d32260c0c42c13b4cc3cf07ef9ccc92494", "d0025407dfb8b601f154c433459abd199f4191ff" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:18:03 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:18:03 2018 -0700" }, "message": "Merge changes from topic \"am-1155d171-2145-4903-8420-80ecfd6c6b08\" into oc-dev\nam: d0025407df\n\nChange-Id: I7186be0877b4649e3246a05ea610c7c5ee75e542\n" }, { "commit": "786ae0d32260c0c42c13b4cc3cf07ef9ccc92494", "tree": "390d01b43e3cc453bee765893ecb41807ac4d77c", "parents": [ "ffe456e49c1ecd4a2220b8c6cd96610386a6a7c7", "70ebabc63d084509e6c79429cf9bb87b63fe5eaa" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:15:41 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:15:41 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637\nam: 70ebabc63d -s ours\n\nChange-Id: I06839e68100abc88459588a4fec9ef4e04f65c08\n" }, { "commit": "cfc6d8607e2b3f4b7c91eba5e20e5c6cc16de91f", "tree": "b6944b3fdacfe7162585a146d012e5d9bac283e8", "parents": [ "1f2e1df6c7f983819daadff67ec7b60eae7728f6", "b71941c9bb88f38fcd7d570ecf92d01fbce69e12" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 30 05:14:30 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 30 05:14:30 2018 +0000" }, "message": "Merge changes from topic \"am-c65d7988-0ca0-4757-9d9c-21f4575eec01\" into nyc-mr2-dev\n\n* changes:\n [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96\n Import translations. DO NOT MERGE\n" }, { "commit": "23162a8897fe2cefa0e090ba7785adc75cc10c67", "tree": "bc62ff3f054875d0a60a2631e90fc82474d2645b", "parents": [ "36b8d4244813bba27d4da5e7034c9f840d1d01d0", "1c484c5d9610717cc40489098f80bffdd8c92aa3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 30 05:14:30 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 30 05:14:30 2018 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into cw-f-dev" }, { "commit": "515700b4feb35ac615c8ca38165f629a67c4d99f", "tree": "493de619ff05f9c63ad18a2ce8afa99dc057c91d", "parents": [ "d0025407dfb8b601f154c433459abd199f4191ff", "976bb372c3b70d37f5336c32faeca09df524f5c2" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 30 05:14:30 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 30 05:14:30 2018 +0000" }, "message": "Merge changes from topic \"am-c65d7988-0ca0-4757-9d9c-21f4575eec01\" into oc-dev\n\n* changes:\n [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb\n [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96\n Import translations. DO NOT MERGE\n" }, { "commit": "ffe456e49c1ecd4a2220b8c6cd96610386a6a7c7", "tree": "390d01b43e3cc453bee765893ecb41807ac4d77c", "parents": [ "dccb62bcca25502ae6a9f0d086bc30ceb1c23950", "843fb76d1f9793822690b6a62fbc9496c8917543" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:10:47 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:10:47 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f\nam: 843fb76d1f -s ours\n\nChange-Id: Id1336208575063e2fe1231b7655731132beb7953\n" }, { "commit": "d0025407dfb8b601f154c433459abd199f4191ff", "tree": "493de619ff05f9c63ad18a2ce8afa99dc057c91d", "parents": [ "843fb76d1f9793822690b6a62fbc9496c8917543", "70ebabc63d084509e6c79429cf9bb87b63fe5eaa" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 30 05:04:27 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 30 05:04:27 2018 +0000" }, "message": "Merge changes from topic \"am-1155d171-2145-4903-8420-80ecfd6c6b08\" into oc-dev\n\n* changes:\n [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637\n [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0\n Import translations. DO NOT MERGE\n" }, { "commit": "1f2e1df6c7f983819daadff67ec7b60eae7728f6", "tree": "b6944b3fdacfe7162585a146d012e5d9bac283e8", "parents": [ "b3e44fae1f841c94813450eaaf2f2cd26fd16ccf", "eff2a7b637eea4dc843969ea9c506b9d9e729e51" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 30 05:04:27 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 30 05:04:27 2018 +0000" }, "message": "Merge changes from topic \"am-1155d171-2145-4903-8420-80ecfd6c6b08\" into nyc-mr2-dev\n\n* changes:\n [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0\n Import translations. DO NOT MERGE\n" }, { "commit": "36b8d4244813bba27d4da5e7034c9f840d1d01d0", "tree": "7c676fcf1d8f4d4874b335c1608b032a85775a0d", "parents": [ "4c781e19f54316a40fc336469e62a23c7669b274", "f9a5e160d08810a2e70281416ea9db7e0f937fc7" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 30 05:04:27 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 30 05:04:27 2018 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into cw-f-dev" }, { "commit": "843fb76d1f9793822690b6a62fbc9496c8917543", "tree": "493de619ff05f9c63ad18a2ce8afa99dc057c91d", "parents": [ "e43837e258a45607b98c366fa933b8c2682a0127", "b3e44fae1f841c94813450eaaf2f2cd26fd16ccf" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 15:53:30 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 15:53:30 2018 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f\n\nChange-Id: I877e44ea6efe845c0c30a3280b512c1253d727ce\n" }, { "commit": "b3e44fae1f841c94813450eaaf2f2cd26fd16ccf", "tree": "b6944b3fdacfe7162585a146d012e5d9bac283e8", "parents": [ "d6143e93077f2f7e530c4b66e702dec29d6cc7bd", "4c781e19f54316a40fc336469e62a23c7669b274" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 15:53:26 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 15:53:26 2018 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5\n\nChange-Id: Ib62c14bc0bb4d205821e8f3b6312c5dca7773fde\n" }, { "commit": "4c781e19f54316a40fc336469e62a23c7669b274", "tree": "6f8ec55ff637e2cfc27ae0df85929318aea5d9a0", "parents": [ "47c831e6757271b527346d695553f9fa88612a41" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 08:53:11 2018 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 08:53:11 2018 -0700" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I556f15b9dc9c144d1ddd3bee21f823a52afdfbf4\nAuto-generated-cl: translation import\n" }, { "commit": "976bb372c3b70d37f5336c32faeca09df524f5c2", "tree": "493de619ff05f9c63ad18a2ce8afa99dc057c91d", "parents": [ "e43837e258a45607b98c366fa933b8c2682a0127", "b71941c9bb88f38fcd7d570ecf92d01fbce69e12" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 15:40:55 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 15:40:55 2018 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb\n\nChange-Id: I5326a09d8328b9767c6420e08e59374910b3ce49\n" }, { "commit": "b71941c9bb88f38fcd7d570ecf92d01fbce69e12", "tree": "b6944b3fdacfe7162585a146d012e5d9bac283e8", "parents": [ "d6143e93077f2f7e530c4b66e702dec29d6cc7bd", "1c484c5d9610717cc40489098f80bffdd8c92aa3" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 15:40:50 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 15:40:50 2018 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96\n\nChange-Id: I5f7b6e78d38bebadba08ce1e2d18302f5e7464ee\n" }, { "commit": "1c484c5d9610717cc40489098f80bffdd8c92aa3", "tree": "286442d572e9c7674ee906936f9d8b9f5c9195fc", "parents": [ "47c831e6757271b527346d695553f9fa88612a41" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 08:40:30 2018 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 08:40:30 2018 -0700" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I544bbffa43bdf203519441dd1d1b66b54bb54238\nAuto-generated-cl: translation import\n" }, { "commit": "70ebabc63d084509e6c79429cf9bb87b63fe5eaa", "tree": "493de619ff05f9c63ad18a2ce8afa99dc057c91d", "parents": [ "e43837e258a45607b98c366fa933b8c2682a0127", "eff2a7b637eea4dc843969ea9c506b9d9e729e51" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 14:41:02 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 14:41:02 2018 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637\n\nChange-Id: Ib22e9ba37dcb69862e8f4c46577e8c240c429c6c\n" }, { "commit": "eff2a7b637eea4dc843969ea9c506b9d9e729e51", "tree": "b6944b3fdacfe7162585a146d012e5d9bac283e8", "parents": [ "d6143e93077f2f7e530c4b66e702dec29d6cc7bd", "f9a5e160d08810a2e70281416ea9db7e0f937fc7" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 14:40:54 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Sun Jul 29 14:40:54 2018 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0\n\nChange-Id: Ic133994f8f27708e96772601a2dcb5e6173dae28\n" }, { "commit": "f9a5e160d08810a2e70281416ea9db7e0f937fc7", "tree": "9d202270dd75523bb47e2b3ce1eefac402418436", "parents": [ "47c831e6757271b527346d695553f9fa88612a41" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 07:40:09 2018 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 07:40:09 2018 -0700" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I2ae5687befc9fd492b9baa7a5ca0bc674a30ebb2\nAuto-generated-cl: translation import\n" }, { "commit": "11768fd80fe62e66df0651b3301315afeb234abb", "tree": "47c1465b963fefd38bd925b6802e8e50a5614a59", "parents": [ "e8b7b3067230592b5fc31c22018b2154eb03d634", "926f7d815cc33d2b2c86a78d111c386cf758fc10" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 27 23:03:19 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 27 23:03:19 2018 +0000" }, "message": "Merge \"Don\u0027t flash system bars while showing an immersive app on lockscreen\" into pi-dev" }, { "commit": "e8b7b3067230592b5fc31c22018b2154eb03d634", "tree": "77a2cd69002a09ef148c4ea9a6790e2425d64e3b", "parents": [ "5ad001eb4f5152cf8d534608ebd2d369e383e8b9", "8fec01a1415e7ae54df587c36dfdc94daa270557" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Fri Jul 27 20:44:17 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 27 20:44:17 2018 +0000" }, "message": "Merge \"Revert to O home button behaviour for over lockscreen activities\" into pi-dev" }, { "commit": "42d27af0daf4c01022e4c6466d81f7fb6ff18191", "tree": "2cb15492bf9f35c148324456b148065808cf3cfa", "parents": [ "5ad001eb4f5152cf8d534608ebd2d369e383e8b9" ], "author": { "name": "Laura Davis", "email": "laurabd@google.com", "time": "Fri Jul 27 12:07:27 2018 -0700" }, "committer": { "name": "Laura Davis", "email": "laurabd@google.com", "time": "Fri Jul 27 12:07:27 2018 -0700" }, "message": "Docs: fixed typo\n\nTest: make ds-docs\n\nBug: 111817624\nChange-Id: I908e06419ab56220b41be6f821cff3258691b3b9\n" }, { "commit": "259ca36bb0f5e1060af63e2fa331af15964ebc12", "tree": "e696bfbbe448b0869696e2069db8d487fe342f71", "parents": [ "5ad001eb4f5152cf8d534608ebd2d369e383e8b9" ], "author": { "name": "Pavel Grafov", "email": "pgrafov@google.com", "time": "Fri Jul 27 14:04:57 2018 +0100" }, "committer": { "name": "Pavel Grafov", "email": "pgrafov@google.com", "time": "Fri Jul 27 16:56:34 2018 +0100" }, "message": "Work profile without password shouldn\u0027t be locked.\n\nNB: there are two functions named setDeviceLockedForUser,\none that is called from refreshDeviceLockedForUser is NOT\nchanged in this CL.\n\nCurrently setDeviceLockedForUser is called for a work profile\nwith separate challenge in the following cases\n1) with \"true\" when it gets locked (screen off or timeout) or\n2) with \"false\" when the user solves work challenge\n\nThe 2nd case never happens if work challenge is empty,\nsince there is nothing to show to the user, so\nmDeviceLockedForUser is set to \"true\" for the profile.\nrefreshDeviceLockedForUser funciton doesn\u0027t change values\nfor work profiles so it remains \"true\" forever. In addition\nif the value is absent in the map, isDeviceLocked defaults\nto \"true\". This way for those profiles it always returns\n\"true\" to Quickstep/Overview which causes the bug.\n\nThis CL changes this behavior in two ways:\n\n1) refreshDeviceLockedForUser now sets the value to \"false\"\nfor managed profiles that have separate but empty challenge.\nThis method is called early enough after reboot and for every\ncredential change, so it updates the value promptly.\n2) setDeviceLocked for those profiles becomes no-op.\n\nThis way \"false\" is maintained in mDeviceLockedForUser.\n\nFor profiles with nonempty (both unified and separate)\nchallenge the behavior is unchanged.\n\nAnother probably more efficient approach would be to initialize\nit to \"false\" for those profiles early enough and track whether\nchallenge becomes empty, but that seems more risky as it adds\nnew logic to boot phases and would require a call from\nLockSettingsService or similar. This seems too risky at this point.\n\nTest: manual, tried locking, unlocking, rebooting in all four\npossible states and transitions between them:\n1) Challenge can be separate or unified\n2) Independently it can be empty or nonempty\nBug: 111838890\nChange-Id: I189035ccd773b1cafed335bceff171a6c42b767f\n" }, { "commit": "8fec01a1415e7ae54df587c36dfdc94daa270557", "tree": "aa77a64c1a04eb85bd9ae49cda2dccdf2d735a6b", "parents": [ "b0e3c67824cd68812ca0dd92bc84358c6a57c733" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Thu Jul 26 14:00:22 2018 -0700" }, "committer": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Thu Jul 26 21:35:46 2018 +0000" }, "message": "Revert to O home button behaviour for over lockscreen activities\n\n- Reverting specific changes from ag/3458963\n\nBug: 111789245\nTest: Launch camera, hit home\nChange-Id: Ib0fe79dbe125e418193f991f22d09777e2bbc3bb\n" }, { "commit": "5ad001eb4f5152cf8d534608ebd2d369e383e8b9", "tree": "f1cd753d518e13f99ac9432b011380f2cfceefb1", "parents": [ "b0e3c67824cd68812ca0dd92bc84358c6a57c733" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Mon Jul 23 18:19:39 2018 -0700" }, "committer": { "name": "Todd Kopriva", "email": "kopriva@google.com", "time": "Thu Jul 26 20:29:39 2018 +0000" }, "message": "docs: added Android P behavior change note to untagSocket reference\n\nstaged here:\nhttps://android-dot-devsite.googleplex.com/reference/android/net/TrafficStats#untagSocket(java.net.Socket)\n\nTest: make ds-docs\n\nExempt-From-Owner-Approval: Docs-only change\n\nBug: 110484513\nChange-Id: I24575e6f4451a019b60c5bf60e17e14a928c6cc3\n" } ], "next": "926f7d815cc33d2b2c86a78d111c386cf758fc10" }