)]}' { "log": [ { "commit": "405bad9416d0bdfb633e6093e8bb78cb848bfdca", "tree": "af6e44a12b4616512bc5268756a036539c45cb35", "parents": [ "a17112dcfaffa646ae72f6362e829f93066124ff", "76abf6638b65d9735ac9f03a6c721037099b6b56" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 10 04:19:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 10 04:19:46 2023 +0000" }, "message": "[automerger skipped] Merge \"Use type safe API of readParcelableArray\" into rvc-dev am: 12e002b951 -s ours am: 76abf6638b -s ours\n\nam skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 58b3271279 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24309763\n\nChange-Id: I606a031e5925a2ce85b22b314d2d3c0b4859d308\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a17112dcfaffa646ae72f6362e829f93066124ff", "tree": "af6e44a12b4616512bc5268756a036539c45cb35", "parents": [ "907bedccfc4fa6e7bb34f9a73803f8a3b304aba0", "464f6ad9a1b85fdaaae20f798bcadb08e027303e" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Thu Aug 10 04:19:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 10 04:19:27 2023 +0000" }, "message": "[automerger skipped] Use type safe API of readParcelableArray am: 60bfbde79f -s ours am: 464f6ad9a1 -s ours\n\nam skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 58b3271279 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24309763\n\nChange-Id: I73aeb6ed121b72b6456322d85adbb87a1e31347e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "907bedccfc4fa6e7bb34f9a73803f8a3b304aba0", "tree": "af6e44a12b4616512bc5268756a036539c45cb35", "parents": [ "05c7fe55fd64b4aeccce65adddaaeea999d2e4ef", "30af067ce48dc4d1e7d6ebae0f37a2ee22778a06" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 10 04:18:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 10 04:18:56 2023 +0000" }, "message": "[automerger skipped] Merge \"Use type safe API of readParcelableArray\" into rvc-qpr-dev am: 30af067ce4 -s ours\n\nam skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 0362efc06e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24309301\n\nChange-Id: I34cd3bfb04ea061332496aa220569f076172d9ba\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "05c7fe55fd64b4aeccce65adddaaeea999d2e4ef", "tree": "af6e44a12b4616512bc5268756a036539c45cb35", "parents": [ "9b25897c6e7b505bde4399386813ae5d246f0ccf", "58b3271279320b9d9cbf12f64eca4df97f6f14c0" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Thu Aug 10 04:18:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 10 04:18:17 2023 +0000" }, "message": "[automerger skipped] Use type safe API of readParcelableArray am: 58b3271279 -s ours\n\nam skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 0362efc06e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24309301\n\nChange-Id: Ib5de3f35d2279307a6875286db9b14a4e2bfe599\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "76abf6638b65d9735ac9f03a6c721037099b6b56", "tree": "5a1771ced1e7d8f7b70ef8f39986cef0dce40076", "parents": [ "464f6ad9a1b85fdaaae20f798bcadb08e027303e", "12e002b951eeb5a4c1734e2d0b9d815cd3b74519" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 10 03:36:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 10 03:36:28 2023 +0000" }, "message": "[automerger skipped] Merge \"Use type safe API of readParcelableArray\" into rvc-dev am: 12e002b951 -s ours\n\nam skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 58b3271279 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24309763\n\nChange-Id: Ia8346eccef61bfe3e84a63979c7c0e35a6526865\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "464f6ad9a1b85fdaaae20f798bcadb08e027303e", "tree": "5a1771ced1e7d8f7b70ef8f39986cef0dce40076", "parents": [ "30af067ce48dc4d1e7d6ebae0f37a2ee22778a06", "60bfbde79f2ffb012abced55d358fdf6380c0bae" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Thu Aug 10 03:36:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 10 03:36:18 2023 +0000" }, "message": "[automerger skipped] Use type safe API of readParcelableArray am: 60bfbde79f -s ours\n\nam skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 58b3271279 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24309763\n\nChange-Id: I0f8e8262c8aebd0bac5b23b09e9f35ac41809438\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "30af067ce48dc4d1e7d6ebae0f37a2ee22778a06", "tree": "5a1771ced1e7d8f7b70ef8f39986cef0dce40076", "parents": [ "7044f0061cc80893aa5d9d3619ec8e262af031d8", "58b3271279320b9d9cbf12f64eca4df97f6f14c0" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 10 03:35:29 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 10 03:35:29 2023 +0000" }, "message": "Merge \"Use type safe API of readParcelableArray\" into rvc-qpr-dev" }, { "commit": "9b25897c6e7b505bde4399386813ae5d246f0ccf", "tree": "af6e44a12b4616512bc5268756a036539c45cb35", "parents": [ "55acbf1c119cb83ac2542b81c85a9812d2512043", "0362efc06e5e3987270b452f6e2ee8fcd78e2b5a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 10 03:14:45 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 10 03:14:45 2023 +0000" }, "message": "Merge \"Use type safe API of readParcelableArray\" into sc-dev" }, { "commit": "12e002b951eeb5a4c1734e2d0b9d815cd3b74519", "tree": "de67ab4cda3a80d339d1c38bdb02f549dcaf231c", "parents": [ "b71dcd28fa6ecc3d9d04834e8ed094c6b5989c54", "60bfbde79f2ffb012abced55d358fdf6380c0bae" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 10 02:59:19 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 10 02:59:19 2023 +0000" }, "message": "Merge \"Use type safe API of readParcelableArray\" into rvc-dev" }, { "commit": "55acbf1c119cb83ac2542b81c85a9812d2512043", "tree": "57bc1efd16175dcddcb4327b7487c799fabb77e5", "parents": [ "5b283f319a9a56e69c250e556b1b127f1126d81f", "7044f0061cc80893aa5d9d3619ec8e262af031d8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 10 00:30:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 10 00:30:50 2023 +0000" }, "message": "Merge \"Fix bypass BAL via `requestGeofence`\" into rvc-dev am: b71dcd28fa am: 7044f0061c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23918399\n\nChange-Id: I47fa799d9694a1d7fcb28166733ebf57d64b1f2b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7044f0061cc80893aa5d9d3619ec8e262af031d8", "tree": "7cdf4e537ce1f3d945b6bf4660b8f0239cf6ea74", "parents": [ "e387e8df3a24808be484edc71207a23fe7c4f547", "b71dcd28fa6ecc3d9d04834e8ed094c6b5989c54" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Aug 09 23:48:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 09 23:48:49 2023 +0000" }, "message": "Merge \"Fix bypass BAL via `requestGeofence`\" into rvc-dev am: b71dcd28fa\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23918399\n\nChange-Id: Iebaa92d5f1e61210406a61020371a3b175e07f97\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b71dcd28fa6ecc3d9d04834e8ed094c6b5989c54", "tree": "b38cdde0fa34cf73013c571f85655251ad8e988d", "parents": [ "a415e44d5bbdec3bf0a169ec8c40d4e1104e6c39", "7f9be7c3c859dc82d37452570d9878b58f6437a9" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Aug 09 23:13:16 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 09 23:13:16 2023 +0000" }, "message": "Merge \"Fix bypass BAL via `requestGeofence`\" into rvc-dev" }, { "commit": "5b283f319a9a56e69c250e556b1b127f1126d81f", "tree": "44e46ae6e5168e3485b244b84897fc9e70c77b3f", "parents": [ "157c443d371136cbc433c12bc1bf5a658229dbc3", "47f289e797560a907790851d3e78865e5f452fd3" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Aug 08 17:18:19 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 08 17:18:19 2023 +0000" }, "message": "Merge \"Add OWNERS for USB functionality\" into sc-dev" }, { "commit": "157c443d371136cbc433c12bc1bf5a658229dbc3", "tree": "2419c5be56f786a7c043e54ff40f66cd73473843", "parents": [ "c4766585b07416f52550d058ad947b4e6a9d2781", "e387e8df3a24808be484edc71207a23fe7c4f547" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Tue Aug 08 04:34:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 04:34:47 2023 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Ignore small source rect hint\" into rvc-dev am: a415e44d5b am: e387e8df3a -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24271007\n\nChange-Id: I3c23da485f8546049d4e1a9fda91aa5e7100678e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c4766585b07416f52550d058ad947b4e6a9d2781", "tree": "2419c5be56f786a7c043e54ff40f66cd73473843", "parents": [ "dbfcfb98c9b4af1c723fb395f86f2bd93f590845", "7d9d26a76e100a189b679fb8b8c6c573245aa1ef" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Tue Aug 08 04:34:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 04:34:10 2023 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Ignore small source rect hint am: a54d763886 am: 7d9d26a76e -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24271007\n\nChange-Id: Iece76b8968b8fc152455d599f611fcf8e1f88430\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e387e8df3a24808be484edc71207a23fe7c4f547", "tree": "72053bcc8a4a24f3c212212eb8b3952ec4d87eb8", "parents": [ "7d9d26a76e100a189b679fb8b8c6c573245aa1ef", "a415e44d5bbdec3bf0a169ec8c40d4e1104e6c39" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Tue Aug 08 03:52:13 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 03:52:13 2023 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Ignore small source rect hint\" into rvc-dev am: a415e44d5b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24271007\n\nChange-Id: I400df1a8f21462ed7b9213aec56e41cf96c4d475\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7d9d26a76e100a189b679fb8b8c6c573245aa1ef", "tree": "72053bcc8a4a24f3c212212eb8b3952ec4d87eb8", "parents": [ "26068ce8741620f5e1d651a859ebdc4b513ae545", "a54d763886ffd69aa14360dc999c76cd2af263f2" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Tue Aug 08 03:52:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 03:52:03 2023 +0000" }, "message": "[RESTRICT AUTOMERGE] Ignore small source rect hint am: a54d763886\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24271007\n\nChange-Id: I1e3f37ca0afec74271252f9c7fed24169b58bb49\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dbfcfb98c9b4af1c723fb395f86f2bd93f590845", "tree": "2419c5be56f786a7c043e54ff40f66cd73473843", "parents": [ "4d517b4865ffcaa2902615c58bc356fa06f6b3be", "4fda9095ba9bdecb8250336d4f0ca328ed7c2aea" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Tue Aug 08 03:04:25 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 08 03:04:25 2023 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Ignore small source rect hint\" into sc-dev" }, { "commit": "a415e44d5bbdec3bf0a169ec8c40d4e1104e6c39", "tree": "3ba9df79104768c2437e8b87a7424be9cbe6a77a", "parents": [ "c1aa2bb3604d9fb46ad5414109028198af378456", "a54d763886ffd69aa14360dc999c76cd2af263f2" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Tue Aug 08 03:03:39 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 08 03:03:39 2023 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Ignore small source rect hint\" into rvc-dev" }, { "commit": "4d517b4865ffcaa2902615c58bc356fa06f6b3be", "tree": "cb057c1090bd7b27d40a13a5c66063f9449cae4e", "parents": [ "7d29675ebdc70459a46cd9e6fce76373d59e86a0", "26068ce8741620f5e1d651a859ebdc4b513ae545" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Tue Aug 08 01:57:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 01:57:24 2023 +0000" }, "message": "[automerger skipped] Merge \"RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets\" into rvc-dev am: c1aa2bb360 -s ours am: 26068ce874 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483\n\nChange-Id: I9a4c04c6ed886fc20af735eb5ae9f922c23b13ff\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7d29675ebdc70459a46cd9e6fce76373d59e86a0", "tree": "cb057c1090bd7b27d40a13a5c66063f9449cae4e", "parents": [ "91c3b175ac7c808302cfbb2071e8999ac285475d", "3b8290a881aa6743d5a9ac459a2de94481a2e0bb" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Tue Aug 08 01:56:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 01:56:39 2023 +0000" }, "message": "[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c21f -s ours am: 3b8290a881 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483\n\nChange-Id: I5cb4ac452df903da4566f369b4d5cd1bddf80976\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "26068ce8741620f5e1d651a859ebdc4b513ae545", "tree": "bbcb1a0ea41302a7fe343516048e5de8b38be49e", "parents": [ "3b8290a881aa6743d5a9ac459a2de94481a2e0bb", "c1aa2bb3604d9fb46ad5414109028198af378456" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Tue Aug 08 01:37:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 01:37:01 2023 +0000" }, "message": "[automerger skipped] Merge \"RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets\" into rvc-dev am: c1aa2bb360 -s ours\n\nam skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 5bd6bb45d7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483\n\nChange-Id: Ie1f65beb4f4fb21e034a32a8f498b953519efe7c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3b8290a881aa6743d5a9ac459a2de94481a2e0bb", "tree": "bbcb1a0ea41302a7fe343516048e5de8b38be49e", "parents": [ "6ff8b636ee1275a463200f54ad6a23e6ba6e22bd", "f0f020c21fd29d8076733e07847e6314172a312e" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Tue Aug 08 01:36:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 01:36:53 2023 +0000" }, "message": "[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c21f -s ours\n\nam skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 5bd6bb45d7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483\n\nChange-Id: I173d272ed17c29565f574fa95c146db34d7be4d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "91c3b175ac7c808302cfbb2071e8999ac285475d", "tree": "cb057c1090bd7b27d40a13a5c66063f9449cae4e", "parents": [ "97b5b9acaecba7614bd3e390b2a8360efd1d9a72", "6ff8b636ee1275a463200f54ad6a23e6ba6e22bd" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Tue Aug 08 01:34:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 01:34:52 2023 +0000" }, "message": "[automerger skipped] Merge \"RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets\" into rvc-qpr-dev am: 6ff8b636ee -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360\n\nChange-Id: I63eed20c8b5a51f7f149568de6e88f2229284a4f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "97b5b9acaecba7614bd3e390b2a8360efd1d9a72", "tree": "cb057c1090bd7b27d40a13a5c66063f9449cae4e", "parents": [ "a3886a3f274461e933826b8c4ab21f2628ffdcd7", "5bd6bb45d70b07243371fbe2f70570e353bb612d" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Tue Aug 08 01:34:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 01:34:09 2023 +0000" }, "message": "[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 5bd6bb45d7 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360\n\nChange-Id: I694a8ddd6f1151927eb71fb2ecede4cfc1d910e0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c1aa2bb3604d9fb46ad5414109028198af378456", "tree": "a5794aeb513779942ad57e08677f11b2adac9f83", "parents": [ "52b91363583c4e2b68f1a818b067cefe04809285", "f0f020c21fd29d8076733e07847e6314172a312e" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Tue Aug 08 00:52:09 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 08 00:52:09 2023 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets\" into rvc-dev" }, { "commit": "6ff8b636ee1275a463200f54ad6a23e6ba6e22bd", "tree": "bbcb1a0ea41302a7fe343516048e5de8b38be49e", "parents": [ "c751a8bf3fb5745bb31ec7c79c63c4a45fc7f073", "5bd6bb45d70b07243371fbe2f70570e353bb612d" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Tue Aug 08 00:52:06 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 08 00:52:06 2023 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets\" into rvc-qpr-dev" }, { "commit": "a3886a3f274461e933826b8c4ab21f2628ffdcd7", "tree": "cb057c1090bd7b27d40a13a5c66063f9449cae4e", "parents": [ "de5f311059d6b00e7be2c0844fc0264913b01fd6", "30d1770dbfa5d5264083de4d50560e1bde3c4ba1" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Tue Aug 08 00:51:59 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 08 00:51:59 2023 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets\" into sc-dev" }, { "commit": "de5f311059d6b00e7be2c0844fc0264913b01fd6", "tree": "e86c86f178a247ddcc829af03a795ac3009a618e", "parents": [ "6e9c41a06c64a506717a1b4831fa786acf37953d", "c751a8bf3fb5745bb31ec7c79c63c4a45fc7f073" ], "author": { "name": "Piyush Mehrotra", "email": "piee@google.com", "time": "Tue Aug 08 00:03:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 08 00:03:28 2023 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Check caller\u0027s uid in backupAgentCreated callback am: 52b9136358 am: c751a8bf3f -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24324114\n\nChange-Id: I2e529393372a60d2cc50712cc895960dba4d9b3e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c751a8bf3fb5745bb31ec7c79c63c4a45fc7f073", "tree": "6d5e02b684de21051c01bf5e6d22c1bbcbef487f", "parents": [ "3daa6a20ea4b7fc5ee8165d25e77a21c5ab208fc", "52b91363583c4e2b68f1a818b067cefe04809285" ], "author": { "name": "Piyush Mehrotra", "email": "piee@google.com", "time": "Mon Aug 07 23:44:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 07 23:44:07 2023 +0000" }, "message": "[DO NOT MERGE] Check caller\u0027s uid in backupAgentCreated callback am: 52b9136358\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24324114\n\nChange-Id: I37dc4defc2e9121fcc1e47a0ea6306a99d1afeee\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6e9c41a06c64a506717a1b4831fa786acf37953d", "tree": "e86c86f178a247ddcc829af03a795ac3009a618e", "parents": [ "ebdcc72a235d6b2a65e1d1c99d7a9eb89f309357", "3daa6a20ea4b7fc5ee8165d25e77a21c5ab208fc" ], "author": { "name": "Piyush Mehrotra", "email": "piee@google.com", "time": "Mon Aug 07 23:41:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 07 23:41:25 2023 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Check caller\u0027s uid in backupAgentCreated callback am: 3daa6a20ea -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24323542\n\nChange-Id: Ied4cdeb96596bc7b8fe1baa3157f6fc6bf6979de\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ebdcc72a235d6b2a65e1d1c99d7a9eb89f309357", "tree": "e86c86f178a247ddcc829af03a795ac3009a618e", "parents": [ "0f4454ce793f91a3171aaf34e321862e2b5cfe0e" ], "author": { "name": "Piyush Mehrotra", "email": "piee@google.com", "time": "Thu Jul 27 19:35:14 2023 +0000" }, "committer": { "name": "Piyush Mehrotra", "email": "piee@google.com", "time": "Mon Aug 07 16:33:12 2023 +0000" }, "message": "[DO NOT MERGE] Check caller\u0027s uid in backupAgentCreated callback\n\nAM.backupAgentCreated() should enforce that caller belongs the package called in the API.\n\nBug: 289549315\nTest: atest android.security.cts.ActivityManagerTest#testActivityManager_backupAgentCreated_rejectIfCallerUidNotEqualsPackageUid\nChange-Id: I9f3ae5ec0b8f00e020d471cc0eddf8bd8bdbb82d\n" }, { "commit": "52b91363583c4e2b68f1a818b067cefe04809285", "tree": "8870528acebb056a09de3b9f64abc942c46be12f", "parents": [ "ba41b02d60a2187df49134cc8be4115057c337dd" ], "author": { "name": "Piyush Mehrotra", "email": "piee@google.com", "time": "Thu Jul 27 19:35:14 2023 +0000" }, "committer": { "name": "Piyush Mehrotra", "email": "piee@google.com", "time": "Mon Aug 07 16:29:07 2023 +0000" }, "message": "[DO NOT MERGE] Check caller\u0027s uid in backupAgentCreated callback\n\nAM.backupAgentCreated() should enforce that caller belongs the package called in the API.\n\nBug: 289549315\nTest: atest android.security.cts.ActivityManagerTest#testActivityManager_backupAgentCreated_rejectIfCallerUidNotEqualsPackageUid\nChange-Id: I9f3ae5ec0b8f00e020d471cc0eddf8bd8bdbb82d\n" }, { "commit": "3daa6a20ea4b7fc5ee8165d25e77a21c5ab208fc", "tree": "6d5e02b684de21051c01bf5e6d22c1bbcbef487f", "parents": [ "4e16b6b4a7f492be7733710ff040ee4bd1527e22" ], "author": { "name": "Piyush Mehrotra", "email": "piee@google.com", "time": "Thu Jul 27 19:35:14 2023 +0000" }, "committer": { "name": "Piyush Mehrotra", "email": "piee@google.com", "time": "Mon Aug 07 16:27:02 2023 +0000" }, "message": "[DO NOT MERGE] Check caller\u0027s uid in backupAgentCreated callback\n\nAM.backupAgentCreated() should enforce that caller belongs the package called in the API.\n\nBug: 289549315\nTest: atest android.security.cts.ActivityManagerTest#testActivityManager_backupAgentCreated_rejectIfCallerUidNotEqualsPackageUid\nChange-Id: I9f3ae5ec0b8f00e020d471cc0eddf8bd8bdbb82d\n" }, { "commit": "47f289e797560a907790851d3e78865e5f452fd3", "tree": "d199c2cbcde66cc07174ebf01b941e9abe716d86", "parents": [ "0f4454ce793f91a3171aaf34e321862e2b5cfe0e" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Wed May 24 06:40:00 2023 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Aug 07 12:46:14 2023 +0000" }, "message": "Add OWNERS for USB functionality\n\nAdd active owners\n\nBug: 284073105\nTest: tests are not required to add owners\n(cherry picked from https://android-review.googlesource.com/q/commit:4c34063041d30e7d8b52bb71babb50d9ca211c04)\nMerged-In: I4ef415437568ae165ac5a3153d18bd2e2ef1f808\nChange-Id: I4ef415437568ae165ac5a3153d18bd2e2ef1f808\n" }, { "commit": "58b3271279320b9d9cbf12f64eca4df97f6f14c0", "tree": "9f08462fc28f07362558aecf367b9fa271c44d47", "parents": [ "4e16b6b4a7f492be7733710ff040ee4bd1527e22" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Thu Aug 03 12:01:29 2023 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu Aug 03 15:41:27 2023 +0000" }, "message": "Use type safe API of readParcelableArray\n\nBug: 291299076\nTest: Build and flash the device and check if it throws exception for\nnon UsbInterface object\nTest: atest CtsUsbManagerTestCases\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85d7e6712a9eeeed3bdd68ea3c3862c7e88bfe70)\nMerged-In: I2917c8331b6d56caaa9a6479bcd9a2d089f5f503\nChange-Id: I2917c8331b6d56caaa9a6479bcd9a2d089f5f503\n" }, { "commit": "0362efc06e5e3987270b452f6e2ee8fcd78e2b5a", "tree": "adff7efe2365eccb0f83448b9ebcb33af5e045f5", "parents": [ "0f4454ce793f91a3171aaf34e321862e2b5cfe0e" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Thu Aug 03 12:01:29 2023 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu Aug 03 15:41:26 2023 +0000" }, "message": "Use type safe API of readParcelableArray\n\nBug: 291299076\nTest: Build and flash the device and check if it throws exception for\nnon UsbInterface object\nTest: atest CtsUsbManagerTestCases\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85d7e6712a9eeeed3bdd68ea3c3862c7e88bfe70)\nMerged-In: I2917c8331b6d56caaa9a6479bcd9a2d089f5f503\nChange-Id: I2917c8331b6d56caaa9a6479bcd9a2d089f5f503\n" }, { "commit": "60bfbde79f2ffb012abced55d358fdf6380c0bae", "tree": "5f4a6f4f62fda9fb1b29d55d3768eb90ae3ba0ae", "parents": [ "ba41b02d60a2187df49134cc8be4115057c337dd" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Thu Aug 03 12:01:29 2023 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu Aug 03 15:41:23 2023 +0000" }, "message": "Use type safe API of readParcelableArray\n\nBug: 291299076\nTest: Build and flash the device and check if it throws exception for\nnon UsbInterface object\nTest: atest CtsUsbManagerTestCases\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85d7e6712a9eeeed3bdd68ea3c3862c7e88bfe70)\nMerged-In: I2917c8331b6d56caaa9a6479bcd9a2d089f5f503\nChange-Id: I2917c8331b6d56caaa9a6479bcd9a2d089f5f503\n" }, { "commit": "0f4454ce793f91a3171aaf34e321862e2b5cfe0e", "tree": "33c66e404d8639b4f950c5b3856cfe13ae38227f", "parents": [ "46f540cb094f6c73c0809a8b87b25c0f04ab2ce4", "8d839e4985d0acc662e1019390c88fab20bacbd6" ], "author": { "name": "Nan Wu", "email": "wnan@google.com", "time": "Thu Aug 03 12:42:16 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 03 12:42:16 2023 +0000" }, "message": "Merge \"DO NOT MERGE Fix BAL via notification.publicVersion\" into sc-dev" }, { "commit": "f0f020c21fd29d8076733e07847e6314172a312e", "tree": "3da3251cd88e690fe34afb621f708ae303a01cf6", "parents": [ "2818ba8c93a6ad55ad58ed7955628aea4dcfa5ae" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Jul 28 22:03:03 2023 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Aug 03 06:38:14 2023 +0000" }, "message": "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets\n\nWhen RescueParty detects that a system process is crashing frequently,\nit tries to recover in various ways, such as by resetting all settings.\nUnfortunately, this included resetting the secure_frp_mode setting,\nwhich is the means by which the system keeps track of whether the\nFactory Reset Protection (FRP) challenge has been passed yet. With this\nsetting reset, some FRP restrictions went away and it became possible to\nbypass FRP by setting a new lockscreen credential.\n\nFix this by excluding secure_frp_mode from resets.\n\nNote: currently this bug isn\u0027t reproducible on \u0027main\u0027 due to ag/23727749\ndisabling much of RescueParty, but that is a temporary change.\n\nBug: 253043065\nTest: With ag/23727749 reverted and with my fix to prevent\n com.android.settings from crashing *not* applied, tried repeatedly\n setting lockscreen credential while in FRP mode, using the\n smartlock setup activity launched by intent via adb. Verified\n that although RescueParty is still triggered after 5 attempts,\n secure_frp_mode is no longer reset (its value remains \"1\").\nTest: Verified that secure_frp_mode still gets changed from 1 to 0 when\n FRP is passed legitimately.\nTest: atest com.android.providers.settings.SettingsProviderTest\nTest: atest android.provider.SettingsProviderTest\nChange-Id: Id95ed43b9cc2208090064392bcd5dc012710af93\n(cherry picked from commit 9890dd7f15c091f7d1a09e4fddb9f85d32015955)\n(changed Global.SECURE_FRP_MODE to Secure.SECURE_FRP_MODE,\n needed because this setting was moved in U)\n(removed static keyword from shouldExcludeSettingFromReset(),\n needed for compatibility with Java 15 and earlier)\n(resolved conflict in resetSettingsLocked())\nMerged-In: Id95ed43b9cc2208090064392bcd5dc012710af93\n" }, { "commit": "5bd6bb45d70b07243371fbe2f70570e353bb612d", "tree": "af0eab9c7598317384a09b773fb6361a035c32a4", "parents": [ "f4361774253065eafb54af0cb7750717145758c6" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Jul 28 22:03:03 2023 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Aug 03 06:36:01 2023 +0000" }, "message": "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets\n\nWhen RescueParty detects that a system process is crashing frequently,\nit tries to recover in various ways, such as by resetting all settings.\nUnfortunately, this included resetting the secure_frp_mode setting,\nwhich is the means by which the system keeps track of whether the\nFactory Reset Protection (FRP) challenge has been passed yet. With this\nsetting reset, some FRP restrictions went away and it became possible to\nbypass FRP by setting a new lockscreen credential.\n\nFix this by excluding secure_frp_mode from resets.\n\nNote: currently this bug isn\u0027t reproducible on \u0027main\u0027 due to ag/23727749\ndisabling much of RescueParty, but that is a temporary change.\n\nBug: 253043065\nTest: With ag/23727749 reverted and with my fix to prevent\n com.android.settings from crashing *not* applied, tried repeatedly\n setting lockscreen credential while in FRP mode, using the\n smartlock setup activity launched by intent via adb. Verified\n that although RescueParty is still triggered after 5 attempts,\n secure_frp_mode is no longer reset (its value remains \"1\").\nTest: Verified that secure_frp_mode still gets changed from 1 to 0 when\n FRP is passed legitimately.\nTest: atest com.android.providers.settings.SettingsProviderTest\nTest: atest android.provider.SettingsProviderTest\nChange-Id: Id95ed43b9cc2208090064392bcd5dc012710af93\n(cherry picked from commit 9890dd7f15c091f7d1a09e4fddb9f85d32015955)\n(changed Global.SECURE_FRP_MODE to Secure.SECURE_FRP_MODE,\n needed because this setting was moved in U)\n(removed static keyword from shouldExcludeSettingFromReset(),\n needed for compatibility with Java 15 and earlier)\n(resolved conflict in resetSettingsLocked())\nMerged-In: Id95ed43b9cc2208090064392bcd5dc012710af93\n" }, { "commit": "30d1770dbfa5d5264083de4d50560e1bde3c4ba1", "tree": "f430c0aaa7d900f1089dbda8a0b29f58a51a60d7", "parents": [ "38e2c0069485d893cd8679825058fbf9cc395259" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Jul 28 22:03:03 2023 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Aug 03 06:34:54 2023 +0000" }, "message": "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets\n\nWhen RescueParty detects that a system process is crashing frequently,\nit tries to recover in various ways, such as by resetting all settings.\nUnfortunately, this included resetting the secure_frp_mode setting,\nwhich is the means by which the system keeps track of whether the\nFactory Reset Protection (FRP) challenge has been passed yet. With this\nsetting reset, some FRP restrictions went away and it became possible to\nbypass FRP by setting a new lockscreen credential.\n\nFix this by excluding secure_frp_mode from resets.\n\nNote: currently this bug isn\u0027t reproducible on \u0027main\u0027 due to ag/23727749\ndisabling much of RescueParty, but that is a temporary change.\n\nBug: 253043065\nTest: With ag/23727749 reverted and with my fix to prevent\n com.android.settings from crashing *not* applied, tried repeatedly\n setting lockscreen credential while in FRP mode, using the\n smartlock setup activity launched by intent via adb. Verified\n that although RescueParty is still triggered after 5 attempts,\n secure_frp_mode is no longer reset (its value remains \"1\").\nTest: Verified that secure_frp_mode still gets changed from 1 to 0 when\n FRP is passed legitimately.\nTest: atest com.android.providers.settings.SettingsProviderTest\nTest: atest android.provider.SettingsProviderTest\nChange-Id: Id95ed43b9cc2208090064392bcd5dc012710af93\n(cherry picked from commit 9890dd7f15c091f7d1a09e4fddb9f85d32015955)\n(changed Global.SECURE_FRP_MODE to Secure.SECURE_FRP_MODE,\n needed because this setting was moved in U)\n(removed static keyword from shouldExcludeSettingFromReset(),\n needed for compatibility with Java 15 and earlier)\nMerged-In: Id95ed43b9cc2208090064392bcd5dc012710af93\n" }, { "commit": "46f540cb094f6c73c0809a8b87b25c0f04ab2ce4", "tree": "f02803743865308e3f9d979991b4d3b65550c501", "parents": [ "b8835cee53146ed1c873d11420f2acca66e6d33c", "4e16b6b4a7f492be7733710ff040ee4bd1527e22" ], "author": { "name": "Nan Wu", "email": "wnan@google.com", "time": "Thu Aug 03 00:59:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 03 00:59:28 2023 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE Fix BAL via notification.publicVersion\" into rvc-dev am: ba41b02d60 am: 4e16b6b4a7 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047\n\nChange-Id: Id0877ae54f352919f8530cfb08b807917dcb57d4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b8835cee53146ed1c873d11420f2acca66e6d33c", "tree": "f02803743865308e3f9d979991b4d3b65550c501", "parents": [ "d892ae179e1a400368796cca19e216fd296531d1", "0e60d06403894a5030e4e9f873140ebfb5598216" ], "author": { "name": "Nan Wu", "email": "wnan@google.com", "time": "Thu Aug 03 00:58:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 03 00:58:54 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761 am: 0e60d06403 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047\n\nChange-Id: If54ffab0f29f2dc145864b0f340ba8e428908c38\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d892ae179e1a400368796cca19e216fd296531d1", "tree": "f02803743865308e3f9d979991b4d3b65550c501", "parents": [ "020addb64fdcda35eff304efe61e89f184f98283", "4b74ba4435f0232d7166141b6efb6ed50b221a0e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 03 00:58:13 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 03 00:58:13 2023 +0000" }, "message": "[automerger skipped] Merge \"[conflict] Merge \"Add userId check before loading icon in Device Controls\" into rvc-dev am: 2818ba8c93\" into rvc-qpr-dev am: 4b74ba4435 -s ours\n\nam skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454\n\nChange-Id: Ic31cc783397f3a29e7c29365044be2b52e91dcaf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "020addb64fdcda35eff304efe61e89f184f98283", "tree": "f02803743865308e3f9d979991b4d3b65550c501", "parents": [ "f1f578c3f155d6545c7464169b007be3b59b51b4", "373c5ac49e78467827763bdbf2fa0252d1cd961b" ], "author": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Thu Aug 03 00:57:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 03 00:57:41 2023 +0000" }, "message": "[automerger skipped] [conflict] Merge \"Add userId check before loading icon in Device Controls\" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours\n\nam skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454\n\nChange-Id: Icedc57c9c52c15042fa39b259c7d2a01dbb11155\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4e16b6b4a7f492be7733710ff040ee4bd1527e22", "tree": "6165386ffa995d0089fcb7ec92c8ccb36c17cbaa", "parents": [ "0e60d06403894a5030e4e9f873140ebfb5598216", "ba41b02d60a2187df49134cc8be4115057c337dd" ], "author": { "name": "Nan Wu", "email": "wnan@google.com", "time": "Thu Aug 03 00:37:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 03 00:37:33 2023 +0000" }, "message": "Merge \"DO NOT MERGE Fix BAL via notification.publicVersion\" into rvc-dev am: ba41b02d60\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047\n\nChange-Id: I87c1b8a390a0801f25d040ec880eb96c6e160fda\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e60d06403894a5030e4e9f873140ebfb5598216", "tree": "6165386ffa995d0089fcb7ec92c8ccb36c17cbaa", "parents": [ "4b74ba4435f0232d7166141b6efb6ed50b221a0e", "75fcbb37617246c43c2af34b12c9ae4b4043f9ac" ], "author": { "name": "Nan Wu", "email": "wnan@google.com", "time": "Thu Aug 03 00:37:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 03 00:37:12 2023 +0000" }, "message": "DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb3761\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047\n\nChange-Id: Iced365d9bef5572692a48787e226264b27a2bd82\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4b74ba4435f0232d7166141b6efb6ed50b221a0e", "tree": "a9683dde66c64227962fb7e4deb6a81ca7db710d", "parents": [ "91771262b1e4256690ed29edf413c0e13fffdf63", "373c5ac49e78467827763bdbf2fa0252d1cd961b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 03 00:23:27 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 03 00:23:27 2023 +0000" }, "message": "Merge \"[conflict] Merge \"Add userId check before loading icon in Device Controls\" into rvc-dev am: 2818ba8c93\" into rvc-qpr-dev" }, { "commit": "ba41b02d60a2187df49134cc8be4115057c337dd", "tree": "3f90da0c74833d34a228a7fa90dfea6cf4b75cb8", "parents": [ "2818ba8c93a6ad55ad58ed7955628aea4dcfa5ae", "75fcbb37617246c43c2af34b12c9ae4b4043f9ac" ], "author": { "name": "Nan Wu", "email": "wnan@google.com", "time": "Wed Aug 02 22:56:31 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 02 22:56:31 2023 +0000" }, "message": "Merge \"DO NOT MERGE Fix BAL via notification.publicVersion\" into rvc-dev" }, { "commit": "f1f578c3f155d6545c7464169b007be3b59b51b4", "tree": "f02803743865308e3f9d979991b4d3b65550c501", "parents": [ "cfce4ff7356800c17a950872ee1d27c9b238078a", "91771262b1e4256690ed29edf413c0e13fffdf63" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Aug 02 21:13:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 02 21:13:48 2023 +0000" }, "message": "[automerger skipped] Merge \"Resolve custom printer icon boundary exploit.\" into rvc-qpr-dev am: 91771262b1 -s ours\n\nam skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca9c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355\n\nChange-Id: I02e6e6de603654ce76c90cf411c1307a1bc60753\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cfce4ff7356800c17a950872ee1d27c9b238078a", "tree": "f02803743865308e3f9d979991b4d3b65550c501", "parents": [ "38e2c0069485d893cd8679825058fbf9cc395259", "658ed370a333c6667198e42ac3722f81788aaff2" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Wed Aug 02 21:13:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 02 21:13:05 2023 +0000" }, "message": "[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370a3 -s ours\n\nam skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca9c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355\n\nChange-Id: Iedbce15376b5f868facb70dfea8ec02cf0a5f341\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "91771262b1e4256690ed29edf413c0e13fffdf63", "tree": "af81cc086734651f6cdda297bb1f7c16a4bfe10e", "parents": [ "f4361774253065eafb54af0cb7750717145758c6", "658ed370a333c6667198e42ac3722f81788aaff2" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Aug 02 20:33:12 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 02 20:33:12 2023 +0000" }, "message": "Merge \"Resolve custom printer icon boundary exploit.\" into rvc-qpr-dev" }, { "commit": "373c5ac49e78467827763bdbf2fa0252d1cd961b", "tree": "a9683dde66c64227962fb7e4deb6a81ca7db710d", "parents": [ "f4361774253065eafb54af0cb7750717145758c6", "2818ba8c93a6ad55ad58ed7955628aea4dcfa5ae" ], "author": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Wed Aug 02 11:25:18 2023 +0000" }, "committer": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Wed Aug 02 13:12:21 2023 +0000" }, "message": "[conflict] Merge \"Add userId check before loading icon in Device Controls\" into rvc-dev am: 2818ba8c93\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23918603\n\nMerged-In: I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2\nMerged-In: I60896a6f53307f0e97a9223b599a2891c6c0c08d\nMerged-In: Ib0e677f7ccbed6299ea07939519c7dcf6d371bec\nMerged-In: Ibe4fb69a90904787b9f97a7cd90d318a047d1e11\nMerged-In: Iba846f19098c71c0519470cd7b8c1fd60d47e70b\nChange-Id: I4666499fa8e2c51a7900913c9e22127cb6a4283a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2818ba8c93a6ad55ad58ed7955628aea4dcfa5ae", "tree": "6dbb06aded3bc2c0f9cbc29e211f15b6ee739f5b", "parents": [ "abd2a232edf476c764ae8578da7f649eeea74098", "331f2f1baaf7b62e90a7d7cb6d4481925b3d9071" ], "author": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Wed Aug 02 10:22:25 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 02 10:22:25 2023 +0000" }, "message": "Merge \"Add userId check before loading icon in Device Controls\" into rvc-dev" }, { "commit": "38e2c0069485d893cd8679825058fbf9cc395259", "tree": "f02803743865308e3f9d979991b4d3b65550c501", "parents": [ "19e0cfd5544e7730507b664d6a1102347c56172c", "22f18e021fa884dc504616a5adfb99ea9d2d77c6" ], "author": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Wed Aug 02 09:23:09 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 02 09:23:09 2023 +0000" }, "message": "Merge \"Add userId check before loading icon in Device Controls\" into sc-dev" }, { "commit": "331f2f1baaf7b62e90a7d7cb6d4481925b3d9071", "tree": "b84bf522a9f8b5b3ffe3772ab06fc64ef8508703", "parents": [ "f9d8830e3264c66d0f39b1d45eadd4039695a112" ], "author": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Tue Jul 04 12:15:41 2023 +0100" }, "committer": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Tue Aug 01 15:53:35 2023 +0000" }, "message": "Add userId check before loading icon in Device Controls\n\nTest: manual with the steps from the bug\nTest: manual with a normal icon\nTest: atest CanUseIconPredicate\nTest: atest ControlViewHolderTest\nBug: 272025416\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ffa97f42dd9496bb404e01727c923292d05a4466)\nMerged-In: I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2\nMerged-In: I60896a6f53307f0e97a9223b599a2891c6c0c08d\nMerged-In: Ib0e677f7ccbed6299ea07939519c7dcf6d371bec\nMerged-In: Ibe4fb69a90904787b9f97a7cd90d318a047d1e11\nMerged-In: Iba846f19098c71c0519470cd7b8c1fd60d47e70b\nChange-Id: I354469a53611c094c7bb695b1c2017c6786dd396\n" }, { "commit": "22f18e021fa884dc504616a5adfb99ea9d2d77c6", "tree": "d936d6fe38120a20a714bb89ea122334a76c8d1d", "parents": [ "28428b737903c9b82d7ce3682336d15d8ad00762" ], "author": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Fri Jul 07 12:05:10 2023 +0100" }, "committer": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Tue Aug 01 15:52:35 2023 +0000" }, "message": "Add userId check before loading icon in Device Controls\n\nTest: manual with the steps from the bug\nTest: manual with a normal icon\nTest: atest CanUseIconPredicate\nTest: atest ControlViewHolderTest\nBug: 272025416\nMerged-In: I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2\nMerged-In: I60896a6f53307f0e97a9223b599a2891c6c0c08d\nMerged-In: Ib0e677f7ccbed6299ea07939519c7dcf6d371bec\nMerged-In: Ibe4fb69a90904787b9f97a7cd90d318a047d1e11\nChange-Id: Iba846f19098c71c0519470cd7b8c1fd60d47e70b\n" }, { "commit": "4fda9095ba9bdecb8250336d4f0ca328ed7c2aea", "tree": "0809bdf7698c950230059ffc007bf977524df2fd", "parents": [ "ddc2eb9d24529e7a946179926f96a5d4ff5d2ac2" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Mon Jul 31 16:47:45 2023 -0700" }, "committer": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Mon Jul 31 16:47:45 2023 -0700" }, "message": "[RESTRICT AUTOMERGE] Ignore small source rect hint\n\nWhich may be abused by malicious app to create a non-visible PiP\nwindow that bypasses the background restriction.\n\nBug: 270368476\nTest: Manually, using the POC app\nChange-Id: I3531a64fc67a1b6c43997ee33b7a7d4ab4e2d985\n" }, { "commit": "a54d763886ffd69aa14360dc999c76cd2af263f2", "tree": "c2ec8dfdfa30c8287a792cfb8e88ca02707b21ab", "parents": [ "5d31bd1c3bf7ddae18dc2f5578efaa1cd0dfb86a" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Mon Jul 31 14:05:36 2023 -0700" }, "committer": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Mon Jul 31 16:14:30 2023 -0700" }, "message": "[RESTRICT AUTOMERGE] Ignore small source rect hint\n\nWhich may be abused by malicious app to create a non-visible PiP\nwindow that bypasses the background restriction.\n\nBug: 270368476\nTest: Manually, using the POC app\nChange-Id: Ifc0e4ffe8b7a9754053246069cb480aa6a59a7e1\n" }, { "commit": "19e0cfd5544e7730507b664d6a1102347c56172c", "tree": "d4e837cd3a5b83cf543fbfb72367489c9cf4ee81", "parents": [ "5f83b3051b76ce4c30a422580447d64ede613710", "f4361774253065eafb54af0cb7750717145758c6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jul 31 23:07:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 31 23:07:20 2023 +0000" }, "message": "[automerger skipped] Merge \"Resolve custom printer icon boundary exploit.\" into rvc-dev am: abd2a232ed am: f436177425 -s ours\n\nam skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca9c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108354\n\nChange-Id: I001895eb6e53cb9f6f283815c99cd8368f25b1e7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f4361774253065eafb54af0cb7750717145758c6", "tree": "af81cc086734651f6cdda297bb1f7c16a4bfe10e", "parents": [ "799e127b0b5d9040339e838dcdf9d69398586d14", "abd2a232edf476c764ae8578da7f649eeea74098" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jul 31 22:27:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 31 22:27:57 2023 +0000" }, "message": "Merge \"Resolve custom printer icon boundary exploit.\" into rvc-dev am: abd2a232ed\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108354\n\nChange-Id: I37c92866051469bc2108adc76fcdf4e1cfa44cb3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5f83b3051b76ce4c30a422580447d64ede613710", "tree": "d4e837cd3a5b83cf543fbfb72367489c9cf4ee81", "parents": [ "ddc2eb9d24529e7a946179926f96a5d4ff5d2ac2", "0e0693ca9cb408d0dc82f6c6b3feb453fc8ddd83" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jul 31 22:08:06 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 31 22:08:06 2023 +0000" }, "message": "Merge \"Resolve custom printer icon boundary exploit.\" into sc-dev" }, { "commit": "abd2a232edf476c764ae8578da7f649eeea74098", "tree": "1436c054d48877f24b1966d2c25e5f1f2a371288", "parents": [ "0dcc5c6eb5eddc66422d658186191e29f39cf3da", "9adc7202d833890753e0a1ce919e75aacee1a92b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jul 31 21:37:07 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 31 21:37:07 2023 +0000" }, "message": "Merge \"Resolve custom printer icon boundary exploit.\" into rvc-dev" }, { "commit": "ddc2eb9d24529e7a946179926f96a5d4ff5d2ac2", "tree": "8449c43aaa54ff62b62809e2dfbcb709e4f3a18e", "parents": [ "5bc9e9288e7f1b93ab90ebc28ef65f56d677cbe1", "799e127b0b5d9040339e838dcdf9d69398586d14" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Thu Jul 27 22:14:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 27 22:14:40 2023 +0000" }, "message": "Merge \"Fixing DatabaseUtils to detect malformed UTF-16 strings\" into rvc-dev am: 0dcc5c6eb5 am: 799e127b0b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24057913\n\nChange-Id: Ic345ae053cef19329022e5a185e136b66298a12a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5bc9e9288e7f1b93ab90ebc28ef65f56d677cbe1", "tree": "88e0823f0005948ff8f1e151d95fbdf1fe9f5176", "parents": [ "1f2e080f1b99cd2162f6cb756fd4694fddb05882", "8451e9a0c7d37fb40ae6ff0b024381a802677b1a" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Thu Jul 27 22:14:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 27 22:14:17 2023 +0000" }, "message": "[automerger skipped] [DO NOT MERGE][conflict] Merge \"Disallow loading icon from content URI to PipMenu\" into rvc-dev am: 5d31bd1c3b am: 8451e9a0c7 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701\n\nChange-Id: Ic85e6bd1ebd14234f9bf3b37f39248d584e44ebc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "799e127b0b5d9040339e838dcdf9d69398586d14", "tree": "5b1bfc85431ddec03f147aa2c6bef1169a945821", "parents": [ "8451e9a0c7d37fb40ae6ff0b024381a802677b1a", "0dcc5c6eb5eddc66422d658186191e29f39cf3da" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Thu Jul 27 21:56:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 27 21:56:26 2023 +0000" }, "message": "Merge \"Fixing DatabaseUtils to detect malformed UTF-16 strings\" into rvc-dev am: 0dcc5c6eb5\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24057913\n\nChange-Id: Idab79d3772b506b3a453a135efb71f9b670eda50\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0dcc5c6eb5eddc66422d658186191e29f39cf3da", "tree": "4d4a20a94b16cf409938cb73d33b2afd2b2acd1d", "parents": [ "5d31bd1c3bf7ddae18dc2f5578efaa1cd0dfb86a", "fb4a72e3943d166088407e61aa4439ac349f3f12" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Thu Jul 27 20:09:42 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 27 20:09:42 2023 +0000" }, "message": "Merge \"Fixing DatabaseUtils to detect malformed UTF-16 strings\" into rvc-dev" }, { "commit": "8451e9a0c7d37fb40ae6ff0b024381a802677b1a", "tree": "4a31ff35de1cba6a403b318df93fccea6203dd63", "parents": [ "b93914a7e73242d3f9d1661fe8816704ac819ece", "5d31bd1c3bf7ddae18dc2f5578efaa1cd0dfb86a" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Thu Jul 27 18:22:51 2023 +0000" }, "committer": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Thu Jul 27 19:14:33 2023 +0000" }, "message": "[DO NOT MERGE][conflict] Merge \"Disallow loading icon from content URI to PipMenu\" into rvc-dev am: 5d31bd1c3b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23424576\n\nBug: 293475290\nChange-Id: Ic50edc109c89378aacc926b5b56aa142f9a01bbb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5d31bd1c3bf7ddae18dc2f5578efaa1cd0dfb86a", "tree": "a33d0f6656ee968c6ea5eecb15006c80bbca3f1f", "parents": [ "287bfd5afd8ab86158dadb7f2ca2bcf370c5942b", "5f5a87d8a0dc9190327ba0e6113d5b80ee96abae" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Thu Jul 27 17:12:07 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 27 17:12:07 2023 +0000" }, "message": "Merge \"Disallow loading icon from content URI to PipMenu\" into rvc-dev" }, { "commit": "5f5a87d8a0dc9190327ba0e6113d5b80ee96abae", "tree": "2cf119b0bdcf1d15eb98425d84805737540ff333", "parents": [ "71e7d4129dcee66f4a2f5b3f4849bf50c61259d2" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Wed May 24 19:35:44 2023 -0700" }, "committer": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Wed Jul 26 22:54:21 2023 +0000" }, "message": "Disallow loading icon from content URI to PipMenu\n\nBug: 278246904\nTest: manually, with the PoC app attached to the bug\nMerged-In: Idbd4081bf464e2b3420d4c3fd22ca37867d26bc0\nMerged-In: Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e\nChange-Id: Iecfc1fb962de611cbe3c51a44ba4fded53925a7d\n" }, { "commit": "1f2e080f1b99cd2162f6cb756fd4694fddb05882", "tree": "88e0823f0005948ff8f1e151d95fbdf1fe9f5176", "parents": [ "0a11e8a7c4ff38345d9a77278d5e8a8bbfbde558", "4bf71d74fc21cd9389dbe00fb750e2f9802eb789" ], "author": { "name": "Hongwei Wang", "email": "hwwang@google.com", "time": "Wed Jul 26 19:35:00 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 26 19:35:00 2023 +0000" }, "message": "Merge \"Disallow loading icon from content URI to PipMenu\" into sc-dev" }, { "commit": "0a11e8a7c4ff38345d9a77278d5e8a8bbfbde558", "tree": "b948cd5ccd132db88df71d0399770519907f4635", "parents": [ "e6f4326547a17aafaac2c9744aa3f91869d70ebf", "b93914a7e73242d3f9d1661fe8816704ac819ece" ], "author": { "name": "Josep del Río", "email": "joseprio@google.com", "time": "Wed Jul 26 12:09:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 26 12:09:40 2023 +0000" }, "message": "[automerger skipped] Merge \"Fix KCM key mapping cloning\" into rvc-dev am: 287bfd5afd am: b93914a7e7 -s ours\n\nam skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24029386\n\nChange-Id: Ic9cba8d16970963a7c37dcf180e1f462020fbd8b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b93914a7e73242d3f9d1661fe8816704ac819ece", "tree": "afb234e0f9f39312de30d4d628bed96f050c8dca", "parents": [ "adc6fe9aa439e3cb7b83058fac4ac58fa90cad1e", "287bfd5afd8ab86158dadb7f2ca2bcf370c5942b" ], "author": { "name": "Josep del Río", "email": "joseprio@google.com", "time": "Wed Jul 26 11:05:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 26 11:05:10 2023 +0000" }, "message": "Merge \"Fix KCM key mapping cloning\" into rvc-dev am: 287bfd5afd\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24029386\n\nChange-Id: I396e64c60ea7a40ef71a89565bfd67202c2e65cc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "287bfd5afd8ab86158dadb7f2ca2bcf370c5942b", "tree": "7338968d7b119723357ecd05dea07e0e030b7c96", "parents": [ "cdb758450b0dbc2398b3facadf8486ef98f2c583", "aaaba6cf190d976efdc5db6c78997dbdc9214c15" ], "author": { "name": "Josep del Río", "email": "joseprio@google.com", "time": "Wed Jul 26 10:34:19 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 26 10:34:19 2023 +0000" }, "message": "Merge \"Fix KCM key mapping cloning\" into rvc-dev" }, { "commit": "0e0693ca9cb408d0dc82f6c6b3feb453fc8ddd83", "tree": "2956f400e585a19ce73800ddfcca5a03e594871f", "parents": [ "e6f4326547a17aafaac2c9744aa3f91869d70ebf" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Mon Jul 17 12:01:18 2023 +0000" }, "committer": { "name": "Ashish Kumar Gupta", "email": "kumarashishg@google.com", "time": "Tue Jul 18 15:28:03 2023 +0000" }, "message": "Resolve custom printer icon boundary exploit.\n\nBecause Settings grants the INTERACT_ACROSS_USERS_FULL permission, an exploit is possible where the third party print plugin service can pass other\u0027s User Icon URI. This CL provides a lightweight solution for parsing the image URI to detect profile exploitation.\n\nBug: 281525042\nTest: Build and flash the code. Try to reproduce the issue with\nmentioned steps in the bug\n\nChange-Id: Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce\nMerged-In: Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce\n" }, { "commit": "658ed370a333c6667198e42ac3722f81788aaff2", "tree": "bb132c4d04a076c7e81ae972eeaf1cfc446be577", "parents": [ "adc6fe9aa439e3cb7b83058fac4ac58fa90cad1e" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Mon Jul 17 12:01:18 2023 +0000" }, "committer": { "name": "Ashish Kumar Gupta", "email": "kumarashishg@google.com", "time": "Tue Jul 18 15:27:30 2023 +0000" }, "message": "Resolve custom printer icon boundary exploit.\n\nBecause Settings grants the INTERACT_ACROSS_USERS_FULL permission, an exploit is possible where the third party print plugin service can pass other\u0027s User Icon URI. This CL provides a lightweight solution for parsing the image URI to detect profile exploitation.\n\nBug: 281525042\nTest: Build and flash the code. Try to reproduce the issue with\nmentioned steps in the bug\n\nChange-Id: Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce\nMerged-In: Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce\n" }, { "commit": "9adc7202d833890753e0a1ce919e75aacee1a92b", "tree": "9765ef4434f18817ce92e8ddc27ee2d404ccc44d", "parents": [ "cdb758450b0dbc2398b3facadf8486ef98f2c583" ], "author": { "name": "kumarashishg", "email": "kumarashishg@google.com", "time": "Mon Jul 17 12:01:18 2023 +0000" }, "committer": { "name": "Ashish Kumar Gupta", "email": "kumarashishg@google.com", "time": "Tue Jul 18 15:25:50 2023 +0000" }, "message": "Resolve custom printer icon boundary exploit.\n\nBecause Settings grants the INTERACT_ACROSS_USERS_FULL permission, an exploit is possible where the third party print plugin service can pass other\u0027s User Icon URI. This CL provides a lightweight solution for parsing the image URI to detect profile exploitation.\n\nBug: 281525042\nTest: Build and flash the code. Try to reproduce the issue with\nmentioned steps in the bug\n\nChange-Id: Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce\nMerged-In: Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce\n" }, { "commit": "fb4a72e3943d166088407e61aa4439ac349f3f12", "tree": "ee6cbf894ac7d64aec750d6c772ae0b78247fc9c", "parents": [ "cdb758450b0dbc2398b3facadf8486ef98f2c583" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Fri Jun 02 23:32:02 2023 +0000" }, "committer": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Thu Jul 13 20:10:00 2023 +0000" }, "message": "Fixing DatabaseUtils to detect malformed UTF-16 strings\n\nTest: tested with POC in bug, also using atest\nBug: 224771621\nChange-Id: Ide65205b83063801971c5778af3154bcf3f0e530\n" }, { "commit": "8d839e4985d0acc662e1019390c88fab20bacbd6", "tree": "99d1b6bf2fb880be4310220976264057ce1d6bbc", "parents": [ "e6f4326547a17aafaac2c9744aa3f91869d70ebf" ], "author": { "name": "Nan Wu", "email": "wnan@google.com", "time": "Fri Jun 16 14:42:24 2023 +0000" }, "committer": { "name": "Nan Wu", "email": "wnan@google.com", "time": "Thu Jul 13 17:54:32 2023 +0000" }, "message": "DO NOT MERGE Fix BAL via notification.publicVersion\n\nWe stripped the token that allows app to retrieve their own notification\nand fire their own PI to launch activities from background. But we\nforgot to strip the token from notification.publicVersion\n\nBug: 278558814\nTest: NotificationManagerTest#testActivityStartFromRetrievedNotification_isBlocked\nChange-Id: I8f25d7a5e47890a0496af023149717e1df482f98\n(cherry picked from commit cf851d81a954f0a6dd0c2fd7defa93932539e7f9)\n" }, { "commit": "e6f4326547a17aafaac2c9744aa3f91869d70ebf", "tree": "b948cd5ccd132db88df71d0399770519907f4635", "parents": [ "e352025e4e7da9fee1de9c4f91565044322abb29", "adc6fe9aa439e3cb7b83058fac4ac58fa90cad1e" ], "author": { "name": "Varun Shah", "email": "varunshah@google.com", "time": "Wed Jul 12 19:36:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 12 19:36:14 2023 +0000" }, "message": "Merge \"Update parcling logic for Uris.\" into rvc-dev am: cdb758450b am: adc6fe9aa4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23835332\n\nChange-Id: Ia42407c266b1a65114901b4f7205717714030d69\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "adc6fe9aa439e3cb7b83058fac4ac58fa90cad1e", "tree": "b8392a99399bd676a9b4c9d97c8ade01c20d7df3", "parents": [ "1b1950ac884c01885dd183ee543cde2c739d5fd7", "cdb758450b0dbc2398b3facadf8486ef98f2c583" ], "author": { "name": "Varun Shah", "email": "varunshah@google.com", "time": "Wed Jul 12 18:45:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 12 18:45:00 2023 +0000" }, "message": "Merge \"Update parcling logic for Uris.\" into rvc-dev am: cdb758450b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23835332\n\nChange-Id: Ib906252b0b2b8e1ca91bd80ef7183e450a19428e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cdb758450b0dbc2398b3facadf8486ef98f2c583", "tree": "632b4a8bd1d129c2eb2498eebe6086c1b3aaabc4", "parents": [ "d4ba55174c50f6c9bc1e5ffdaf7fc66915e300c0", "18a2f95baeabdf23ecdb0475e62b8395825a26f6" ], "author": { "name": "Varun Shah", "email": "varunshah@google.com", "time": "Wed Jul 12 17:59:51 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 12 17:59:51 2023 +0000" }, "message": "Merge \"Update parcling logic for Uris.\" into rvc-dev" }, { "commit": "aaaba6cf190d976efdc5db6c78997dbdc9214c15", "tree": "1308cdb6e9943ae004cd9e469dc313bd3c3eb0ab", "parents": [ "d4ba55174c50f6c9bc1e5ffdaf7fc66915e300c0" ], "author": { "name": "Josep del Rio", "email": "joseprio@google.com", "time": "Wed Jul 12 16:32:05 2023 +0000" }, "committer": { "name": "Josep del Rio", "email": "joseprio@google.com", "time": "Wed Jul 12 16:32:05 2023 +0000" }, "message": "Fix KCM key mapping cloning\n\nag/23792288 tried to fix a security issue by cloning the key\nmappings, but unfortunately the parcel was not being rewinded.\n\nBug: 274058082\nTest: Confirmed change works in newer Android versions\nMerged-In: I745008a0a8ea30830660c45dcebee917b3913d13\nChange-Id: I6f75b9202e20d82ebf81a35a2916e653ee1b8372\n" }, { "commit": "e352025e4e7da9fee1de9c4f91565044322abb29", "tree": "b578104ca1f7d220bc8d690d8653ebbe59c36064", "parents": [ "a523a1d5dee0d310e7227f1d342910f423510d38", "73fa082a7202100da107ae14dd7742ecd86da053" ], "author": { "name": "Tim Yu", "email": "yunicorn@google.com", "time": "Mon Jul 10 22:31:28 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 10 22:31:28 2023 +0000" }, "message": "Merge \"[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews\" into sc-dev" }, { "commit": "a523a1d5dee0d310e7227f1d342910f423510d38", "tree": "9855581ec77848fa1b6d056599382497a9833d73", "parents": [ "c2599b2f1d933de3571ead9202926fe53abd8951", "1b1950ac884c01885dd183ee543cde2c739d5fd7" ], "author": { "name": "Tim Yu", "email": "yunicorn@google.com", "time": "Mon Jul 10 20:14:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 20:14:43 2023 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews\" into rvc-dev am: d4ba55174c am: 1b1950ac88 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23846296\n\nChange-Id: I48c93f48374033cd6846f83eeb3ed1c90cd464af\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c2599b2f1d933de3571ead9202926fe53abd8951", "tree": "9855581ec77848fa1b6d056599382497a9833d73", "parents": [ "5fee6c5cbbebc0c7bb25f6ba310bca712ba42799", "60612ed1d776443cc86bb3ee5f283efc45281245" ], "author": { "name": "Tim Yu", "email": "yunicorn@google.com", "time": "Mon Jul 10 20:14:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 20:14:30 2023 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 26beceb9a2 am: 60612ed1d7 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23846296\n\nChange-Id: I1833a9bd69ea2b88f6ee601e8747b1df466f3352\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5fee6c5cbbebc0c7bb25f6ba310bca712ba42799", "tree": "9855581ec77848fa1b6d056599382497a9833d73", "parents": [ "bb05da7b1a79775bf8d138b98dbb5d98d5de562c", "0590bd0072a367367fca134ed709ffa52bdc72ed" ], "author": { "name": "Tim Yu", "email": "yunicorn@google.com", "time": "Mon Jul 10 20:14:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 20:14:01 2023 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews\" into rvc-qpr-dev am: 0590bd0072 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23985766\n\nChange-Id: I809edb81652876be8e71442955011d2c0f4e7e3d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bb05da7b1a79775bf8d138b98dbb5d98d5de562c", "tree": "9855581ec77848fa1b6d056599382497a9833d73", "parents": [ "354583d7f1160b90864a690a552f33da330ae032", "5c72cd48097f7cdaa62e9eb1a0aeddbb941ec981" ], "author": { "name": "Tim Yu", "email": "yunicorn@google.com", "time": "Mon Jul 10 20:13:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 20:13:47 2023 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 5c72cd4809 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23985766\n\nChange-Id: Ie864e3af0562831c2d6c7d1aa7759e944ede9d14\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1b1950ac884c01885dd183ee543cde2c739d5fd7", "tree": "c72f6758a1afcfcc15e6898f88eae399ab34c884", "parents": [ "60612ed1d776443cc86bb3ee5f283efc45281245", "d4ba55174c50f6c9bc1e5ffdaf7fc66915e300c0" ], "author": { "name": "Tim Yu", "email": "yunicorn@google.com", "time": "Mon Jul 10 20:11:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 20:11:47 2023 +0000" }, "message": "Merge \"[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews\" into rvc-dev am: d4ba55174c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23846296\n\nChange-Id: Ia1f2944e37b371f6a80586c851b0787686af3eb2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "60612ed1d776443cc86bb3ee5f283efc45281245", "tree": "c72f6758a1afcfcc15e6898f88eae399ab34c884", "parents": [ "0590bd0072a367367fca134ed709ffa52bdc72ed", "26beceb9a252a50374d056b162fa7e8ea55051b3" ], "author": { "name": "Tim Yu", "email": "yunicorn@google.com", "time": "Mon Jul 10 20:11:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 20:11:35 2023 +0000" }, "message": "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 26beceb9a2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23846296\n\nChange-Id: Iffbaacbdefe4ae2cb742b0dcdd0bf76be48405bb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0590bd0072a367367fca134ed709ffa52bdc72ed", "tree": "c72f6758a1afcfcc15e6898f88eae399ab34c884", "parents": [ "41cce389fd86249efe3a12c2ea20470f9ef24df5", "5c72cd48097f7cdaa62e9eb1a0aeddbb941ec981" ], "author": { "name": "Tim Yu", "email": "yunicorn@google.com", "time": "Mon Jul 10 19:46:40 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 10 19:46:40 2023 +0000" }, "message": "Merge \"[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews\" into rvc-qpr-dev" }, { "commit": "d4ba55174c50f6c9bc1e5ffdaf7fc66915e300c0", "tree": "119ab5d3dc4f7487b83bc3a7d00a61f02cb33cd8", "parents": [ "e597df6fd0609e144e00127cb17bcfbff969ae46", "26beceb9a252a50374d056b162fa7e8ea55051b3" ], "author": { "name": "Tim Yu", "email": "yunicorn@google.com", "time": "Mon Jul 10 19:46:29 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 10 19:46:29 2023 +0000" }, "message": "Merge \"[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews\" into rvc-dev" }, { "commit": "354583d7f1160b90864a690a552f33da330ae032", "tree": "9855581ec77848fa1b6d056599382497a9833d73", "parents": [ "b0a33db6d6fd556379eda318c0464392bed9704d", "41cce389fd86249efe3a12c2ea20470f9ef24df5" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jul 10 15:38:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 15:38:33 2023 +0000" }, "message": "[automerger skipped] Merge \"Improve user handling when querying for resumable media\" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours\n\nam skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099\n\nChange-Id: Ic0f26b17a8c00131c925f2ea595121adade13132\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b0a33db6d6fd556379eda318c0464392bed9704d", "tree": "9855581ec77848fa1b6d056599382497a9833d73", "parents": [ "458c17a5aebb5db91cc33b5a33b3972a1e466473", "3134c90f79449e8b662f07163d4f374ef7054567" ], "author": { "name": "Beth Thibodeau", "email": "ethibodeau@google.com", "time": "Mon Jul 10 15:38:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 15:38:12 2023 +0000" }, "message": "[automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours\n\nam skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099\n\nChange-Id: Ic0b71395b83f8cf0b84a0221686b28da1eeab161\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "41cce389fd86249efe3a12c2ea20470f9ef24df5", "tree": "de2877b8dd8443b87b945b700f81e72e971f1031", "parents": [ "3134c90f79449e8b662f07163d4f374ef7054567", "e597df6fd0609e144e00127cb17bcfbff969ae46" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jul 10 14:54:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 14:54:38 2023 +0000" }, "message": "[automerger skipped] Merge \"Improve user handling when querying for resumable media\" into rvc-dev am: e597df6fd0 -s ours\n\nam skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099\n\nChange-Id: Ic6f864ca5657f61b9511a609077c2c844dcc4c09\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3134c90f79449e8b662f07163d4f374ef7054567", "tree": "de2877b8dd8443b87b945b700f81e72e971f1031", "parents": [ "83d362e91d56c3ceb7a04dc87c0274fbc3ace145", "684492a0dfb0c045a07906a2a79d5e785e3b794d" ], "author": { "name": "Beth Thibodeau", "email": "ethibodeau@google.com", "time": "Mon Jul 10 14:54:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 14:54:32 2023 +0000" }, "message": "[automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours\n\nam skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099\n\nChange-Id: I164860da1413eca9d5b9c1a1e4f3991fd6248e0e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "458c17a5aebb5db91cc33b5a33b3972a1e466473", "tree": "9855581ec77848fa1b6d056599382497a9833d73", "parents": [ "8bcc2965641d202d4e2a794a5627ce917cc8cd14", "83d362e91d56c3ceb7a04dc87c0274fbc3ace145" ], "author": { "name": "Josep del Río", "email": "joseprio@google.com", "time": "Mon Jul 10 14:35:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 14:35:30 2023 +0000" }, "message": "[automerger skipped] Merge \"Do not share key mappings with JNI object\" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours\n\nam skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288\n\nChange-Id: Icfbad10c769ba3074855e6268cf5bbf6b5974098\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e597df6fd0609e144e00127cb17bcfbff969ae46", "tree": "b604adbf3aa59897793f8ed8b2ff1493926af5d5", "parents": [ "6676e5a88b311663e3c09aa7954ea9b591bffa45", "684492a0dfb0c045a07906a2a79d5e785e3b794d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jul 10 14:10:21 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 10 14:10:21 2023 +0000" }, "message": "Merge \"Improve user handling when querying for resumable media\" into rvc-dev" }, { "commit": "83d362e91d56c3ceb7a04dc87c0274fbc3ace145", "tree": "de2877b8dd8443b87b945b700f81e72e971f1031", "parents": [ "3b8eb303ffa2629050e5c2774aeeb4506446a736", "6676e5a88b311663e3c09aa7954ea9b591bffa45" ], "author": { "name": "Josep del Río", "email": "joseprio@google.com", "time": "Mon Jul 10 13:51:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 10 13:51:59 2023 +0000" }, "message": "Merge \"Do not share key mappings with JNI object\" into rvc-dev am: 6676e5a88b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288\n\nChange-Id: I6eaf07979ae4f1002b0938b6706a34c71d92abdb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "6676e5a88b311663e3c09aa7954ea9b591bffa45" }