)]}' { "log": [ { "commit": "bdb694010a345deb50ab0aba2ce43ad8b19d2c38", "tree": "042c20241b1cdd855ec3a66249f6fed0fb9f5b2d", "parents": [ "bd5e7702586779cf9c167f37a7d5d4c32c8b9b0d", "0221130bd7a1e91ba1a687fa589712f7ee3cbdda" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 23:27:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 23:27:03 2023 +0000" }, "message": "Add and use PasswordMetrics#validateCredential() am: 811f091fff am: 5074551422 am: 770959fc9e am: 0221130bd7\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775377\n\nChange-Id: I964d37a130f48cd7e32c81496a6695a8537ae947\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5f0ac93d77e463356db8f53580c8e3b0912245f5", "tree": "ea503641d360124254ca7647747171ab4175f3aa", "parents": [ "363e9088b9410d744f28f8b6399ef5f83e06d3ba", "b796581825f07240e778bbccb30d59c824a11191" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 23:26:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 23:26:23 2023 +0000" }, "message": "Handle incomplete protectors in destroyAllWeakTokenBasedProtectors() am: 397f5416a1 am: 1375406ce5 am: 81ae939e46 am: b796581825\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775373\n\nChange-Id: Ia6f9c7d1638bf407091ade1042c24adec62e388c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "363e9088b9410d744f28f8b6399ef5f83e06d3ba", "tree": "4e1a0725bc782a8a83b46da6b44dc1eff2878709", "parents": [ "336a89af49d8e31468ffc9f1d4a93a5e479dfdd9", "e34669b495d16a38378032493dac07007e47723e" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 23:26:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 23:26:12 2023 +0000" }, "message": "LockSettingsService: remove redundant calls to verifyChallenge() am: 0ca264698e am: 88793a8382 am: 4d1d52bc4d am: e34669b495\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775371\n\nChange-Id: I46395e85e70b42188547b44de9db8fd5e691459f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0221130bd7a1e91ba1a687fa589712f7ee3cbdda", "tree": "3a568a9c7ad585032846c756bb37b236ba094ce8", "parents": [ "afaa9f9448743dc98e83baed17ef868614e6e680", "770959fc9e2db67a02200faaacbc86e8f84eb354" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 22:22:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 22:22:41 2023 +0000" }, "message": "Add and use PasswordMetrics#validateCredential() am: 811f091fff am: 5074551422 am: 770959fc9e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775377\n\nChange-Id: I0c0873da36f502767f3135fc7f1555a8725bc64d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b796581825f07240e778bbccb30d59c824a11191", "tree": "4c89e7a7ca57ed113d5fa8175f773ced45501f01", "parents": [ "e34669b495d16a38378032493dac07007e47723e", "81ae939e46fd4e521688170a36820fd1442194b7" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 22:22:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 22:22:05 2023 +0000" }, "message": "Handle incomplete protectors in destroyAllWeakTokenBasedProtectors() am: 397f5416a1 am: 1375406ce5 am: 81ae939e46\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775373\n\nChange-Id: I933a2ce779ea382087375b54ca5e814f7d4125a1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e34669b495d16a38378032493dac07007e47723e", "tree": "432dcb3010901391502ee249ef3407277649c05c", "parents": [ "84be83e0a9aea680d29fb35835e271661eb99be4", "4d1d52bc4d3f92a94a498f05856256da14d04c14" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 22:21:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 22:21:51 2023 +0000" }, "message": "LockSettingsService: remove redundant calls to verifyChallenge() am: 0ca264698e am: 88793a8382 am: 4d1d52bc4d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775371\n\nChange-Id: Iea947ad8f9d188520afa31ff179a9cd684d47676\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "770959fc9e2db67a02200faaacbc86e8f84eb354", "tree": "b3ab1cbd3c54c182f881953d64a3706c5ee4ddba", "parents": [ "2b99fb823ea79b5d24c2918d0829537ff96a83eb", "5074551422f37c993d0eda35eae7957816bbb2d6" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 21:48:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 21:48:00 2023 +0000" }, "message": "Add and use PasswordMetrics#validateCredential() am: 811f091fff am: 5074551422\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775377\n\nChange-Id: I2d944f07c9c359d2b7c6345b6d980d3b156ce4ac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "81ae939e46fd4e521688170a36820fd1442194b7", "tree": "24d3837f1d3c8c0c8f2045216f57221bb648a67e", "parents": [ "4d1d52bc4d3f92a94a498f05856256da14d04c14", "1375406ce5bfae6fa762e91e426ebe0df3a32aeb" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 21:47:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 21:47:16 2023 +0000" }, "message": "Handle incomplete protectors in destroyAllWeakTokenBasedProtectors() am: 397f5416a1 am: 1375406ce5\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775373\n\nChange-Id: Ica6528613b894aec40848ae22b5c3fbde4266dfe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4d1d52bc4d3f92a94a498f05856256da14d04c14", "tree": "70be8933186de309141bb4b5604fd93727f94abe", "parents": [ "b744140fa9efbd013e37fedd3b8be8a9ee8028d6", "88793a838232e3fa51446c35c71bbde011691398" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 21:47:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 21:47:03 2023 +0000" }, "message": "LockSettingsService: remove redundant calls to verifyChallenge() am: 0ca264698e am: 88793a8382\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775371\n\nChange-Id: I589414ba6005a08b40dc7fb6c52a6ed04aa60dac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5074551422f37c993d0eda35eae7957816bbb2d6", "tree": "52055675cabaea29191fe78798f0405cafd9f624", "parents": [ "056931662445fe78049150ebb04b9ec0937756f3", "811f091fff976cc46561824a16915feb108beb6a" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 20:51:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 20:51:03 2023 +0000" }, "message": "Add and use PasswordMetrics#validateCredential() am: 811f091fff\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775377\n\nChange-Id: Ia70d5d075fbea147101004d4da3971193e6b7e00\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1375406ce5bfae6fa762e91e426ebe0df3a32aeb", "tree": "b1fa942bccfe7a5f41e6aee8a3abba0024f28a05", "parents": [ "88793a838232e3fa51446c35c71bbde011691398", "397f5416a169091113eca7713d7912c7066c8d8f" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 20:50:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 20:50:42 2023 +0000" }, "message": "Handle incomplete protectors in destroyAllWeakTokenBasedProtectors() am: 397f5416a1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775373\n\nChange-Id: Ie8dcfce4bbf12ed8c24d2f7d93890a2bdd62a781\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "88793a838232e3fa51446c35c71bbde011691398", "tree": "2ea19aef42fc2e787adc1f15c2aad966a1743772", "parents": [ "2e78341988552402c8089ba03b4bf472ab568d93", "0ca264698ee68fcfe63ef3631c7876a5a425ece3" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Oct 09 20:50:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 20:50:35 2023 +0000" }, "message": "LockSettingsService: remove redundant calls to verifyChallenge() am: 0ca264698e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775371\n\nChange-Id: I77e666d50ec9340719919d700695f9d9f1e4cd75\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "95bb984fcab1a0c8e9e2657f51c381754c1de23f", "tree": "48f53a572c21a8c71542f2f2e750e5e34cd2ae86", "parents": [ "04e5d8bf97e783f771cc04e83d1bafe4aa8bc23a", "47de64a38aa1799cb41f41b2ea0c539ee61de64d" ], "author": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Mon Oct 09 19:32:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 19:32:24 2023 +0000" }, "message": "Merge \"Stop using deprecated getParcelable method in AccountManagerService.\" into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91 am: 096a905a9e am: 9b0970ed45 am: 47de64a38a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646\n\nChange-Id: I0be6d15109e837d36728adc72f3808b91a81d73b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "47de64a38aa1799cb41f41b2ea0c539ee61de64d", "tree": "f934d7e0f78dfb01133bf1f742175768bc509796", "parents": [ "aeccbc583be90164d867be34352e28badf7dc0fd", "9b0970ed459791138211b48e2cc86983dd3f242c" ], "author": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Mon Oct 09 18:56:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 18:56:33 2023 +0000" }, "message": "Merge \"Stop using deprecated getParcelable method in AccountManagerService.\" into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91 am: 096a905a9e am: 9b0970ed45\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646\n\nChange-Id: If51f47e2d172c1df47a546d7014539d816b480bf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d86e6afc0999cf1a5112d5f48e0a9334cd304406", "tree": "5695b50f5b6b10b6830e2dbeed344e29fd03a130", "parents": [ "0b6fee96d4dc821d1b5557a178ce9a5475c11856", "096a905a9ea7b41cd0b2c5a304ea2bd7b63b45ce" ], "author": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Mon Oct 09 18:24:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 18:24:31 2023 +0000" }, "message": "Merge \"Stop using deprecated getParcelable method in AccountManagerService.\" into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91 am: 096a905a9e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646\n\nChange-Id: I3d1c545da2234a9244e8ee2fd7842ce3a2a62088\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "eb818d94a2f1ec3b2e3f56e2122e87bb97b1b1b3", "tree": "0c41581340c09294b00e4b97cdb80cf6508bd999", "parents": [ "af821717bef7f9a3fab840e394e11cd923f800ba", "bbeab357de4957b0605f46b1b058bb8a6ca9626a" ], "author": { "name": "Raphael Kim", "email": "raphk@google.com", "time": "Mon Oct 09 18:23:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 18:23:14 2023 +0000" }, "message": "Merge \"[CDM] Validate component name length before requesting notification access.\" into udc-qpr-dev am: bbeab357de\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805675\n\nChange-Id: I0a5f961b1b2beb5980ec699c4e6f5c94fc6b8d83\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9b0970ed459791138211b48e2cc86983dd3f242c", "tree": "e14ae41fe0a1eb84481126ab7b52399e99db8107", "parents": [ "ffeefd073467ce3def0bb227e6e6afe688bfd484", "096a905a9ea7b41cd0b2c5a304ea2bd7b63b45ce" ], "author": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Mon Oct 09 18:22:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 18:22:38 2023 +0000" }, "message": "Merge \"Stop using deprecated getParcelable method in AccountManagerService.\" into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91 am: 096a905a9e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646\n\nChange-Id: Ibd643c023c52ddbc13dd3be7fe606346dab14ff0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bbeab357de4957b0605f46b1b058bb8a6ca9626a", "tree": "1c9f526a842b251ece4f3ed42ad49fee6af678d8", "parents": [ "bb23c47240b349c9dc601e1332ccfd48e4c46f2d", "380a8f736de5cfd64c4e9f70024796fb790b4805" ], "author": { "name": "Raphael Kim", "email": "raphk@google.com", "time": "Mon Oct 09 17:55:49 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 09 17:55:49 2023 +0000" }, "message": "Merge \"[CDM] Validate component name length before requesting notification access.\" into udc-qpr-dev" }, { "commit": "096a905a9ea7b41cd0b2c5a304ea2bd7b63b45ce", "tree": "9cebad7758c5de0f17588cbd96c070815f5eda37", "parents": [ "70ae1f4e778430ece7dccdd024122244e063cb96", "ba2eb5ba91dae6b866c75a4fc3342991f3f784f2" ], "author": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Mon Oct 09 17:17:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 17:17:58 2023 +0000" }, "message": "Merge \"Stop using deprecated getParcelable method in AccountManagerService.\" into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646\n\nChange-Id: Iee23dba1131908df274359afeca3b18d17a6c8b0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7ec6e931a91bbb182a704b351b388d7ee3d1ac0b", "tree": "2ef942e27fbf5a7a40125aa21b2d03553a8e8c92", "parents": [ "31f3cdc6a7d749684ab08afb7f3daa343aca44b6", "7ac53eb45eca1b0908295a744bcf6ae7501184ef" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 09 16:42:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 16:42:40 2023 +0000" }, "message": "Merge \"Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`\" into main am: 07588c8f9d am: b828559150 am: 7ac53eb45e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2777763\n\nChange-Id: I2b5958823c28f2abbce5ccd9f41ab3444e71c511\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ba2eb5ba91dae6b866c75a4fc3342991f3f784f2", "tree": "1384e62f9486f1682bbb911db0c0caba978e7e5a", "parents": [ "31c2eb6356a100ab26ee78d6c66798948eefbf09", "916057d17e14e164f1f7db019225dea34121a9d8" ], "author": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Mon Oct 09 16:41:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 16:41:40 2023 +0000" }, "message": "Merge \"Stop using deprecated getParcelable method in AccountManagerService.\" into tm-dev am: 019015b6d4 am: 916057d17e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646\n\nChange-Id: Ib9fb3f05eed4f2d2ff52b4696291363e33f22a04\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "916057d17e14e164f1f7db019225dea34121a9d8", "tree": "be488706575abb0e00b6e14d9915cd2445d51b4c", "parents": [ "9d1ae98784b70b629c340e0609dfaa43f4e6382c", "019015b6d4ca643ab826673bff3d307da0464db9" ], "author": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Mon Oct 09 16:26:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 16:26:39 2023 +0000" }, "message": "Merge \"Stop using deprecated getParcelable method in AccountManagerService.\" into tm-dev am: 019015b6d4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646\n\nChange-Id: Ic6e1b397c4071dfe28c82e8081c1112cf201dd6e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7ac53eb45eca1b0908295a744bcf6ae7501184ef", "tree": "e4ea29004d77be83d5e66083442243500ece8466", "parents": [ "c0ae9b5e46073a445079563861d99ffb3f909ae6", "b828559150a15fe8779e3ec0b3ce7f53f8def1c7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 09 16:10:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 16:10:14 2023 +0000" }, "message": "Merge \"Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`\" into main am: 07588c8f9d am: b828559150\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2777763\n\nChange-Id: I791edd7034db851ee5918c9484e1f89f91e198be\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "019015b6d4ca643ab826673bff3d307da0464db9", "tree": "c788c5baeba6c55ad4656874c5da3205ddb772f6", "parents": [ "fe790c6685a5b4f93644ddfb80f2b41f750ea29e", "7a24a283a360e816d2bfb2aa124c4eb2efd1be61" ], "author": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Mon Oct 09 15:57:52 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 09 15:57:52 2023 +0000" }, "message": "Merge \"Stop using deprecated getParcelable method in AccountManagerService.\" into tm-dev" }, { "commit": "07588c8f9d8fc05e0b555b3cce286fff403844c8", "tree": "3e7f371883bb0a144deb460b437c13b4bf7c086a", "parents": [ "7039b4f75837c949102caf9f54b9ca6dd1888458", "eea2175d96aa04f13cbdc6379c7e5ab7fa065a88" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 09 14:48:15 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 09 14:48:15 2023 +0000" }, "message": "Merge \"Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`\" into main" }, { "commit": "e5e5d53c31615b23a7c20ec0b900b7a6d690222c", "tree": "d64f2dde1220fc9d2c701806a43cd3901b8c1602", "parents": [ "40a74a7b701fa5c6e7fa6bfbc4c1bb35ef701c40" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Thu Aug 24 16:27:30 2023 +0000" }, "committer": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Mon Oct 09 08:23:49 2023 +0000" }, "message": "Truncate user data to a limit of 500 characters\n\nFix vulnerability that allows creating users with no restrictions. This is done by creating an intent to create a user and putting extras that are too long to be serialized. It causes IOException and the restrictions are not written in the file.\n\nBy truncating the string values when writing them to the file, we ensure that the exception does not happen and it can be recorded correctly.\n\nBug: 293602317\nTest: install app provided in the bug, open app and click add. Check logcat to see there is no more IOException. Reboot the device by either opening User details page or running adb shell dumpsys user | grep -A12 heen and see that the restrictions are in place.\nChange-Id: I633dc10974a64ef2abd07e67ff2d209847129989\nMerged-In: I633dc10974a64ef2abd07e67ff2d209847129989\n(cherry picked from commit 59042a32c7e192d160c295ecb6477a09bb5da0bb)\n" }, { "commit": "9d1ae98784b70b629c340e0609dfaa43f4e6382c", "tree": "f1910db37f648fa075ca2c0bf177c787bfd3df4f", "parents": [ "6008c6155f311e038dc9b8715dcf476ea06cfd1c", "fe790c6685a5b4f93644ddfb80f2b41f750ea29e" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Mon Oct 09 00:13:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 09 00:13:22 2023 +0000" }, "message": "Merge \"Truncate user data to a limit of 500 characters\" into sc-v2-dev am: 240808177e am: fe790c6685\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788\n\nChange-Id: Icf23608602fe8060b4b723fb9a904a37f3c09d98\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fe790c6685a5b4f93644ddfb80f2b41f750ea29e", "tree": "34614856730d52663766a80a4b565c623b9b7153", "parents": [ "1cb821baf54eabcfa5df972e748928538d1dc7ad", "240808177eb0df23133ab02ec395e63d9857a55a" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Sun Oct 08 23:38:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Oct 08 23:38:54 2023 +0000" }, "message": "Merge \"Truncate user data to a limit of 500 characters\" into sc-v2-dev am: 240808177e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788\n\nChange-Id: Iccda013add64f332c0ef3a5a240ea8ac34253839\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "240808177eb0df23133ab02ec395e63d9857a55a", "tree": "53c3c7ab5fd13f5c725017ce85aef689a48cf214", "parents": [ "4dd7b2cfb9098b542ca2e1e8fadf06010efd3a9f", "59042a32c7e192d160c295ecb6477a09bb5da0bb" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Sun Oct 08 23:14:10 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Oct 08 23:14:10 2023 +0000" }, "message": "Merge \"Truncate user data to a limit of 500 characters\" into sc-v2-dev" }, { "commit": "2974202948ec9a02718ba7dd1ec5b6c3cbeb1f0b", "tree": "79050e35d4acd6f327d98e98191904c03ec25336", "parents": [ "0ff843b28328d70ee64ae364b74e0a76c3f68121", "ad7ba51ceb316f035752cad9af7f6dfa02c61d42" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Sun Oct 08 23:05:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Oct 08 23:05:49 2023 +0000" }, "message": "Merge \"Truncate user data to a limit of 500 characters\" into udc-dev am: bbf3e2efaa am: ad7ba51ceb\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665407\n\nChange-Id: Iaca5ce1407306b424beccfc7489c92ab491e5e5b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7ecf0a0102f88737aa6b8cc88731aeabc6900cc1", "tree": "aea8c4bbaa0ebb8e41d5b87ed97a1d202b6cebe1", "parents": [ "a6d966c08f72e9d4905d233a0876bdb5df5097f7", "bbf3e2efaa614864dbaf97eaaaf2b388730ce54b" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Sun Oct 08 22:28:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Oct 08 22:28:47 2023 +0000" }, "message": "Merge \"Truncate user data to a limit of 500 characters\" into udc-dev am: bbf3e2efaa\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665407\n\nChange-Id: Id6570f7f2e2da3bd9804657e37dbd0aa586b3625\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ad7ba51ceb316f035752cad9af7f6dfa02c61d42", "tree": "83a9dca95f714bafcf96bf1a49cc26331c15a5e6", "parents": [ "2985b8ae4624ab77b3e2001d0992412476f03761", "bbf3e2efaa614864dbaf97eaaaf2b388730ce54b" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Sun Oct 08 22:27:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Oct 08 22:27:39 2023 +0000" }, "message": "Merge \"Truncate user data to a limit of 500 characters\" into udc-dev am: bbf3e2efaa\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665407\n\nChange-Id: Ic91e6c937cc27cb59dacfae626fdf524363a9e10\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bbf3e2efaa614864dbaf97eaaaf2b388730ce54b", "tree": "4dbe372121a76f5781aef388853f819d9afe1a88", "parents": [ "10a0cf5e700de043a4ac179f12cdffb89d1f5f66", "1bc8e28626843225b09b2b070685f81fbadefc08" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Sun Oct 08 21:56:23 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Oct 08 21:56:23 2023 +0000" }, "message": "Merge \"Truncate user data to a limit of 500 characters\" into udc-dev" }, { "commit": "8718a383536227fef35a5d0986c4d967849dcce3", "tree": "7158f1703255d3477ec6bb11a8398e52d89b78cb", "parents": [ "681ac82f9ee373187cc42602434726aa53d1e6a3", "abbd1b917ef56ce12d351f51f3b636852b8b825d" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Sun Oct 08 17:47:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Oct 08 17:47:04 2023 +0000" }, "message": "Merge \"Truncate user data to a limit of 500 characters\" into udc-qpr-dev am: abbd1b917e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24905123\n\nChange-Id: I071920131e9bc65d54481eaa127413f86101b281\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "abbd1b917ef56ce12d351f51f3b636852b8b825d", "tree": "41baa1803bc248565b85f16770299436501c5784", "parents": [ "531713b510e38e9bc658b809571593140a6cab13", "2816d254ddbbfc0270b0c034384c90cb594b702e" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Sun Oct 08 17:17:40 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Oct 08 17:17:40 2023 +0000" }, "message": "Merge \"Truncate user data to a limit of 500 characters\" into udc-qpr-dev" }, { "commit": "0ff843b28328d70ee64ae364b74e0a76c3f68121", "tree": "8195fc88cf4c504f4554b7103c74a5bd7c48c5dd", "parents": [ "5c41a9ac62c7759cdc55858a0b81f53d40ce0ff0", "a6d966c08f72e9d4905d233a0876bdb5df5097f7" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 03:41:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 03:41:03 2023 +0000" }, "message": "Merge \"Clean up obsolete aliases for Truth.\" into main am: 7039b4f758 am: b83975af73 am: a6d966c08f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2776855\n\nChange-Id: I868cd529517c9f5e313a0f917f1afa4a785e688c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6d966c08f72e9d4905d233a0876bdb5df5097f7", "tree": "47c9da854c7ba2160b79d23b90486e13c5a2a08e", "parents": [ "6fd2aa27c54b8264b86face9b3cc61865a4bc17f", "b83975af738480e39fe9f889fb8ed4775ca58ce4" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 03:06:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 03:06:43 2023 +0000" }, "message": "Merge \"Clean up obsolete aliases for Truth.\" into main am: 7039b4f758 am: b83975af73\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2776855\n\nChange-Id: I86a1d2be3476fc114ccccd7662aaf8ea8fef9567\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7039b4f75837c949102caf9f54b9ca6dd1888458", "tree": "c820e31d8b3b95b37e7fa7b66dfa782d17215ec6", "parents": [ "93568334ba1427e8be9dc5013f5b5e0a8e1d61f3", "bbe98fe36bd58fe4844189c51851bdbc133502ba" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 02:07:38 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Oct 07 02:07:38 2023 +0000" }, "message": "Merge \"Clean up obsolete aliases for Truth.\" into main" }, { "commit": "8d2425a767ec02434d4ee7f1823274481501e421", "tree": "c3d0dbe09310770fac99a68fabfff5ed4af0e4c6", "parents": [ "cabf940dba5b9399bf6f4d4c6492bcf7dcb17222" ], "author": { "name": "Atneya Nair", "email": "atneya@google.com", "time": "Fri Jun 30 16:32:18 2023 -0700" }, "committer": { "name": "Atneya Nair", "email": "atneya@google.com", "time": "Sat Oct 07 00:00:23 2023 +0000" }, "message": "Mark FakeLatencyTracker as flaky\n\nDeviceConfig callbacks often block indef and cause test module timeouts.\n\nAdd a test timeout for this class and mark them as flaky to take out of\npresubmit.\n\nTODO: 275746222 - don\u0027t rely on these callbacks, and instead mock/fake\nthe config, since it isn\u0027t related to what we are testing.\n\nBug: 287361279\nBug: 303578791\n\nChange-Id: I603ebe0ceac23335248a8cdb299d52829b55536a\nMerged-In: I603ebe0ceac23335248a8cdb299d52829b55536a\n" }, { "commit": "eea2175d96aa04f13cbdc6379c7e5ab7fa065a88", "tree": "5a126b6056bce6995c923a991901a036231b1c16", "parents": [ "cabf940dba5b9399bf6f4d4c6492bcf7dcb17222" ], "author": { "name": "Chandru S", "email": "chandruis@google.com", "time": "Tue Aug 01 21:08:56 2023 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Oct 06 20:45:04 2023 +0000" }, "message": "Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`\n\nThis change was introduce in commit fd27baff3430033aafbb31bbab6bc560afb8a219.\nTest: verified manually,\n 1. adb shell settings put global systemui/buffer/KeyguardUpdateMonitorLog DEBUG\n 2. adb logcat -s \"TrustRepositoryLog:*\"\n 3. Disable Extend Unlock and enable it, see the onTrustManagedChanged being passed with false and then true.\nChange-Id: I2a4e3579d945a8c993b1a03eb27b05ceb4c4c792\nMerged-In: I2a4e3579d945a8c993b1a03eb27b05ceb4c4c792\n(cherry picked from commit b772ef6eaabcabefe96c3c284e23e8024b7c545a)\n" }, { "commit": "bbe98fe36bd58fe4844189c51851bdbc133502ba", "tree": "506819852611d8b3b12dc97d464e3eb9a361656e", "parents": [ "cabf940dba5b9399bf6f4d4c6492bcf7dcb17222" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Oct 06 20:25:28 2023 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Oct 06 20:25:28 2023 +0000" }, "message": "Clean up obsolete aliases for Truth.\n\nBug: 255714762\nTest: presubmit\nChange-Id: I7e29732e1e77e37cfb491521d14d2f3eb07deb36\nMerged-In: I7e29732e1e77e37cfb491521d14d2f3eb07deb36\n" }, { "commit": "ce1b2a1cedabf7ec417196ed1c7146bef87ca826", "tree": "84531a2833726eac575a46dc441170c721196a5c", "parents": [ "2bf9417aab859368763e7b00cdf0253cfcb95d4e" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Oct 06 20:16:49 2023 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Fri Oct 06 20:16:54 2023 +0000" }, "message": "Clean up obsolete aliases for Truth.\n\nBug: 255714762\nTest: presubmit\nChange-Id: I7e29732e1e77e37cfb491521d14d2f3eb07deb36\nMerged-In: I7e29732e1e77e37cfb491521d14d2f3eb07deb36\n" }, { "commit": "7806f3c6ec8b62dce48360b64d1c2cccc4866e51", "tree": "31d88a2a556859630efea114c81c286aad776122", "parents": [ "2d2e7fd118827785173b51747bc7a1bb236856ae", "1f758ee33f19efce1b57270d518e444d13309731" ], "author": { "name": "Beth Thibodeau", "email": "ethibodeau@google.com", "time": "Fri Oct 06 18:51:24 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 06 18:51:24 2023 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork\" into sc-v2-dev" }, { "commit": "1f758ee33f19efce1b57270d518e444d13309731", "tree": "fd3d8e9051c66f5e96c029935ae2d952e0128708", "parents": [ "9fd44ec14f89b8b4ef4415479ed2ec08b1a39a5b" ], "author": { "name": "Beth Thibodeau", "email": "ethibodeau@google.com", "time": "Tue Aug 08 16:19:48 2023 -0500" }, "committer": { "name": "Beth Thibodeau", "email": "ethibodeau@google.com", "time": "Fri Oct 06 17:26:45 2023 +0000" }, "message": "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork\n\nWhen resumable media is added that has artwork set via URI, check the\npermissions for the URI before attempting to load it\n\nTest: atest MediaDataManagerTest UriGrantsManagerServiceTest\nTest: manual with test app\nBug: 284297452\nChange-Id: Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3\nMerged-In: Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3\n" }, { "commit": "2bf9417aab859368763e7b00cdf0253cfcb95d4e", "tree": "27b3fe6f9b2c2802ee2b8625be7733a8fd469ee8", "parents": [ "ddb0d9cccd56aa279ce7ef99eff7066e253bcea8", "732bb20fe1931c20a8b9138e0cddff958297c8e1" ], "author": { "name": "Pinyao Ting", "email": "pinyaoting@google.com", "time": "Fri Oct 06 17:20:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 17:20:22 2023 +0000" }, "message": "Merge \"Allow settings app to request pin appwidgets from other apps.\" into udc-qpr-dev am: 732bb20fe1\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24933432\n\nChange-Id: I0515f129d3f16167e6f83b0746bb30f494401faf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "811f091fff976cc46561824a16915feb108beb6a", "tree": "fb0d8b032ac237a13d672e1a5db5de8f4db9e16e", "parents": [ "019ec7a6ffa56cf4ee7292e0f1995ec0ecd682bd" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Wed Jun 21 05:28:11 2023 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Oct 06 17:03:20 2023 +0000" }, "message": "Add and use PasswordMetrics#validateCredential()\n\nAdd a method PasswordMetrics#validateCredential() which takes a\nLockscreenCredential argument and honors the \"invalid chars\" flag in it.\nThis should be used instead of PasswordMetrics#validatePassword() which\ndoes not honor the \"invalid chars\" flag (which it does not have access\nto) and only works for PASSWORD and PIN, not PATTERN and NONE.\n\nConvert all callers of validatePassword() in frameworks/base to use\nvalidateCredential(). After this, two callers remain: one in\npackages/apps/Settings which I\u0027ll convert right away too, and several in\npackages/apps/Car/Settings which will take a bit longer to get rid of.\n\nBug: 219511761\nBug: 232900169\nBug: 243881358\nTest: atest PasswordMetricsTest\nTest: Verified that \u0027locksettings set-password\u0027 no longer accepts\n a non-ASCII char that was accepted before\nTest: see I5f1822a34688473cb103eb64dca56e4c19d4dd08\nChange-Id: Ib8f43aef5b5aa5bb059780707582d0419f9ddf9a\nMerged-In: Ib8f43aef5b5aa5bb059780707582d0419f9ddf9a\n(cherry picked from commit 813f32c92cd915e41011c960940d50f28f0f58f2)\n" }, { "commit": "397f5416a169091113eca7713d7912c7066c8d8f", "tree": "fd8e398295921972bfa1508ddb76ae5f777b9d03", "parents": [ "0ca264698ee68fcfe63ef3631c7876a5a425ece3" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Jun 09 21:11:06 2023 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Oct 06 17:03:20 2023 +0000" }, "message": "Handle incomplete protectors in destroyAllWeakTokenBasedProtectors()\n\nA partner reported a NullPointerException in\nSyntheticPasswordManager#destroyAllWeakTokenBasedProtectors() because\nloadState(SP_BLOB_NAME, ...) returned null. I think the only way this\ncould happen is if an incomplete protector exists on-disk due to a\ncrash, containing the secdiscardable file but not the spblob file.\n\nIt does seem theoretically possible, though, so make\ndestroyAllWeakTokenBasedProtectors() handle this case by filtering the\nprotectors by the existence of the spblob file.\n\nBug: 285241930\nChange-Id: Ia148234aa332ca716dcb208a814ae2d3b3c9f6b7\nMerged-In: Ia148234aa332ca716dcb208a814ae2d3b3c9f6b7\n(cherry picked from commit 937dae7f44840d186d2ff25e438fbd3b4503bb98)\n" }, { "commit": "0ca264698ee68fcfe63ef3631c7876a5a425ece3", "tree": "0f032c6e35d6c6624ff3d098876298359584fb9d", "parents": [ "62023142cbc0dd3c0f7556731b762fcc23ee3965" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Feb 17 20:06:21 2023 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Oct 06 15:40:41 2023 +0000" }, "message": "LockSettingsService: remove redundant calls to verifyChallenge()\n\nBoth unlockLskfBasedProtector() and unlockTokenBasedProtector() do a\nGatekeeper verification immediately after decrypting the SP. Therefore,\nit\u0027s redundant for doVerifyCredential() to do it again.\n\nSimilarly, the same thing is redundant in\nsetLockCredentialWithSpLocked() too, since either\nunlockLskfBasedProtector() or unlockTokenBasedProtector() was just\ncalled to get the SP in the first place.\n\nRemove these redundant calls to verifyChallenge() to simplify the code\nand improve performance.\n\nBug: 269394345\nTest: atest AuthBoundKeyTest\nTest: atest com.android.server.locksettings\nChange-Id: Ib73b4a082793458cedb7d06d3f81b77abb427426\nMerged-In: Ib73b4a082793458cedb7d06d3f81b77abb427426\n(cherry picked from commit e9d7d483cfc66420f11ac33c5f2492e2721d4e4a)\n" }, { "commit": "59042a32c7e192d160c295ecb6477a09bb5da0bb", "tree": "e0fc25e9edf8143752841f283e690ae4dd611d9f", "parents": [ "5ca3ba7c7ce93c609b779952ad38f2400244d260" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Thu Aug 24 16:27:30 2023 +0000" }, "committer": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Fri Oct 06 12:34:31 2023 +0000" }, "message": "Truncate user data to a limit of 500 characters\n\nFix vulnerability that allows creating users with no restrictions. This is done by creating an intent to create a user and putting extras that are too long to be serialized. It causes IOException and the restrictions are not written in the file.\n\nBy truncating the string values when writing them to the file, we ensure that the exception does not happen and it can be recorded correctly.\n\nBug: 293602317\nTest: install app provided in the bug, open app and click add. Check logcat to see there is no more IOException. Reboot the device by either opening User details page or running adb shell dumpsys user | grep -A12 heen and see that the restrictions are in place.\nChange-Id: I633dc10974a64ef2abd07e67ff2d209847129989\nMerged-In: I633dc10974a64ef2abd07e67ff2d209847129989\n" }, { "commit": "1bc8e28626843225b09b2b070685f81fbadefc08", "tree": "4e63265e80a9ff1240033aa2e91c37c5c2e0ce9b", "parents": [ "981a4dcd4259fb60139bfb391ee409ec302e60fa" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Thu Aug 24 16:27:30 2023 +0000" }, "committer": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Fri Oct 06 12:34:06 2023 +0000" }, "message": "Truncate user data to a limit of 500 characters\n\nFix vulnerability that allows creating users with no restrictions. This is done by creating an intent to create a user and putting extras that are too long to be serialized. It causes IOException and the restrictions are not written in the file.\n\nBy truncating the string values when writing them to the file, we ensure that the exception does not happen and it can be recorded correctly.\n\nBug: 293602317\nTest: install app provided in the bug, open app and click add. Check logcat to see there is no more IOException. Reboot the device by either opening User details page or running adb shell dumpsys user | grep -A12 heen and see that the restrictions are in place.\nChange-Id: I633dc10974a64ef2abd07e67ff2d209847129989\nMerged-In: I633dc10974a64ef2abd07e67ff2d209847129989\n" }, { "commit": "2816d254ddbbfc0270b0c034384c90cb594b702e", "tree": "cb00c21c15832b089749a8f6df35cd0805b8d763", "parents": [ "c872e0de9559e6d112f48a051a9c95714a31a775" ], "author": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Thu Aug 24 16:27:30 2023 +0000" }, "committer": { "name": "Tetiana Meronyk", "email": "tetianameronyk@google.com", "time": "Fri Oct 06 12:33:50 2023 +0000" }, "message": "Truncate user data to a limit of 500 characters\n\nFix vulnerability that allows creating users with no restrictions. This is done by creating an intent to create a user and putting extras that are too long to be serialized. It causes IOException and the restrictions are not written in the file.\n\nBy truncating the string values when writing them to the file, we ensure that the exception does not happen and it can be recorded correctly.\n\nBug: 293602317\nTest: install app provided in the bug, open app and click add. Check logcat to see there is no more IOException. Reboot the device by either opening User details page or running adb shell dumpsys user | grep -A12 heen and see that the restrictions are in place.\nChange-Id: I633dc10974a64ef2abd07e67ff2d209847129989\nMerged-In: I633dc10974a64ef2abd07e67ff2d209847129989\n" }, { "commit": "0f61179f99826f81b3a2d679a7fbfdb29c6878f2", "tree": "a9487930e1f212aa48448b68828d632d6830e477", "parents": [ "0fa092ace2db8789f11202c5a449027fb82770e7" ], "author": { "name": "Pinyao Ting", "email": "pinyaoting@google.com", "time": "Mon Sep 25 22:22:28 2023 +0000" }, "committer": { "name": "Pinyao Ting", "email": "pinyaoting@google.com", "time": "Thu Oct 05 20:51:27 2023 +0000" }, "message": "Allow settings app to request pin appwidgets from other apps.\n\nBug: 301963214\nTest: manually verified with a test app and a non-privileged permission\nChange-Id: If8a5a28afe98e5c6dc57e063c2015fa8279f24b4\n" }, { "commit": "380a8f736de5cfd64c4e9f70024796fb790b4805", "tree": "9c00bbca3081199c2b194d15eb3bae63cfa3e9f0", "parents": [ "ed8ee2777a8a865a6428ea0efd85974f345746d2" ], "author": { "name": "Raphael Kim", "email": "raphk@google.com", "time": "Mon Sep 18 14:07:23 2023 -0700" }, "committer": { "name": "Raphael Kim", "email": "raphk@google.com", "time": "Thu Oct 05 18:24:58 2023 +0000" }, "message": "[CDM] Validate component name length before requesting notification access.\n\nBug: 295335110\nTest: Test app with long component name\nChange-Id: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579\nMerged-In: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579\n(cherry picked from commit 067a0e3e3fa9e2e545cc6a5f018b2b079a9db9fc)\n" }, { "commit": "0776a21aa75151629ee2df477bc245b43c64b04c", "tree": "8f5db91be35f8bd176c7c6f43255b84c66a66b26", "parents": [ "e80ef17eac55655c06a23db621bf196b151750ff", "80a36bf7149a2e251994c14dbc86cb73fc14369b" ], "author": { "name": "Beth Thibodeau", "email": "ethibodeau@google.com", "time": "Thu Oct 05 15:50:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 05 15:50:12 2023 +0000" }, "message": "Merge \"Check URI permissions for resumable media artwork\" into udc-dev am: 80a36bf714\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24555974\n\nChange-Id: I7166ef956497863ba37b1a85b7da24f6eed7b587\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "80a36bf7149a2e251994c14dbc86cb73fc14369b", "tree": "46932fdaa2ae3a1d0b662b5562114f0cccd611a0", "parents": [ "896c255adfa9b0edd7d664fd2f9de897b1e3a1ff", "c8b7d562cfd8006e12ffcd621ec7811a393025f6" ], "author": { "name": "Beth Thibodeau", "email": "ethibodeau@google.com", "time": "Thu Oct 05 14:54:32 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 05 14:54:32 2023 +0000" }, "message": "Merge \"Check URI permissions for resumable media artwork\" into udc-dev" }, { "commit": "7a24a283a360e816d2bfb2aa124c4eb2efd1be61", "tree": "18df29bab49900ab00003a5facfdf0b7cd6b1415", "parents": [ "632a8b8a439419a26923919e9ba3c81f075dfc93" ], "author": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Wed Oct 04 15:02:03 2023 -0700" }, "committer": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Wed Oct 04 15:02:03 2023 -0700" }, "message": "Stop using deprecated getParcelable method in AccountManagerService.\n\nTest: N/A\nBug: 299930871\nChange-Id: I5a55acffe2e9ef2842c383a352b0bac66c6f1a55\n" }, { "commit": "6098b731683c60253f87988fc335d7254b96c70a", "tree": "20e46bbcc80d62d575cb84db84bd7fc9dc0852cf", "parents": [ "df71837271eeccdf48a350bbf2ca3fa8997c9bf1", "751ad018bf20c8cb32f6ca2531fd755d3c13dbd4" ], "author": { "name": "Victor Hsieh", "email": "victorhsieh@google.com", "time": "Wed Oct 04 19:54:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 19:54:28 2023 +0000" }, "message": "Merge \"Remove broken records in OWNERS\" into main am: d6a0ca5238 am: 28d14d9cb6 am: fd49d80b73 am: 751ad018bf\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2772524\n\nChange-Id: I43c507acc807f96a2d6ceaa9179e5e6506a8d79a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "751ad018bf20c8cb32f6ca2531fd755d3c13dbd4", "tree": "60ae8ec41b8d16efc920e9bc97d5bfdd80c68503", "parents": [ "4dfc2dc2a09c39e669168b564cf8b796c28da87b", "fd49d80b7355b0763f48f375c5259ae1f0681f54" ], "author": { "name": "Victor Hsieh", "email": "victorhsieh@google.com", "time": "Wed Oct 04 19:22:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 19:22:46 2023 +0000" }, "message": "Merge \"Remove broken records in OWNERS\" into main am: d6a0ca5238 am: 28d14d9cb6 am: fd49d80b73\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2772524\n\nChange-Id: Ib8a208477fd0e38be174945b00aea4448f877680\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fd49d80b7355b0763f48f375c5259ae1f0681f54", "tree": "0f2387bae50c81079bd2e3acaee7b9d14c190793", "parents": [ "232cdbf73b58def824e9a3e81933178aa94a1732", "28d14d9cb695438bb198a27af404c5f79f849418" ], "author": { "name": "Victor Hsieh", "email": "victorhsieh@google.com", "time": "Wed Oct 04 18:50:02 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 18:50:02 2023 +0000" }, "message": "Merge \"Remove broken records in OWNERS\" into main am: d6a0ca5238 am: 28d14d9cb6\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2772524\n\nChange-Id: I652e09b4d3add377e971fd67459a4c62bffbc2dc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "28d14d9cb695438bb198a27af404c5f79f849418", "tree": "6b2a0ea3314aee7c3152cf194ae78269b67162fd", "parents": [ "07ecb1c0e85c7dc017d858a51fada360532db635", "d6a0ca52385de2c4dece1d46f0336d15e0f66c39" ], "author": { "name": "Victor Hsieh", "email": "victorhsieh@google.com", "time": "Wed Oct 04 18:17:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 18:17:36 2023 +0000" }, "message": "Merge \"Remove broken records in OWNERS\" into main am: d6a0ca5238\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2772524\n\nChange-Id: I4da7b48ca5ac821a7471c11b0066fb63561a44b0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d6a0ca52385de2c4dece1d46f0336d15e0f66c39", "tree": "bb04fe03eb94a3f8efb423a850a3fb5d84d35805", "parents": [ "32bb22c3469f66c984ec02a7deead934a444532a", "3af3c58ac876d5cd727cc2efed3e82a8ee98b58d" ], "author": { "name": "Victor Hsieh", "email": "victorhsieh@google.com", "time": "Wed Oct 04 17:49:57 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 04 17:49:57 2023 +0000" }, "message": "Merge \"Remove broken records in OWNERS\" into main" }, { "commit": "3af3c58ac876d5cd727cc2efed3e82a8ee98b58d", "tree": "a8009e53039134a4f41557282eaf8f399a7c3eaf", "parents": [ "9361d76bc36b8cf3f51702e6b58750a0491ee16b" ], "author": { "name": "Victor Hsieh", "email": "victorhsieh@google.com", "time": "Wed Oct 04 10:32:37 2023 -0700" }, "committer": { "name": "Victor Hsieh", "email": "victorhsieh@google.com", "time": "Wed Oct 04 10:39:50 2023 -0700" }, "message": "Remove broken records in OWNERS\n\nThese are blocking any OWNERS change.\n\nBug: 303060651\nTest: repo upload\nChange-Id: Id9763fb487e94440df2e61fbb7910902baa12fa8\n" }, { "commit": "89a4392bc5f640106ee2eba8597ea44c2896efd1", "tree": "e99affcffb873f739c63f9c9cc54f3a7ec1ce30b", "parents": [ "cc3fc75c779cea23164a68da6c1af8b211294c3f", "774f23614f73f01363fbdcc6e27fce477b3b53d8" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Oct 04 12:32:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 12:32:19 2023 +0000" }, "message": "Merge \"Refactoring recovery related code\" into main am: c41f52c34f am: aa32ee64bb am: 657c22c229 am: 774f23614f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765105\n\nChange-Id: Ie8ef995979ea9af9c8ae2f8f30eb08c7185a1aa6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "774f23614f73f01363fbdcc6e27fce477b3b53d8", "tree": "a19f752fcddcb672da016ba0c2371ce76f747b2c", "parents": [ "5909d62b3e883772991cb3fea50e80f7ef5bbf66", "657c22c2295cf4e4eae17f7a45c3f47a6de08803" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Oct 04 12:01:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 12:01:58 2023 +0000" }, "message": "Merge \"Refactoring recovery related code\" into main am: c41f52c34f am: aa32ee64bb am: 657c22c229\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765105\n\nChange-Id: Ic0c26cbc2ae6bbfc8218f19fb3e95ed0517093bd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "657c22c2295cf4e4eae17f7a45c3f47a6de08803", "tree": "dc71836e2204cfd379d2c2576471bac1736fbb73", "parents": [ "958a6cad6e6aac1af9d56bad89cdadde7db7ad9e", "aa32ee64bb65b320c909e8eb50734690eb68554e" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Oct 04 11:30:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 11:30:52 2023 +0000" }, "message": "Merge \"Refactoring recovery related code\" into main am: c41f52c34f am: aa32ee64bb\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765105\n\nChange-Id: I574874ad662b15773ae150eae75770139b739924\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aa32ee64bb65b320c909e8eb50734690eb68554e", "tree": "3d37fdf7c6ca1a1246696a9c893d64194fe64284", "parents": [ "f61ec5be0fe7fcda8f92ca3e19a84f093f64cb17", "c41f52c34fda9843e6b10277d0861447e16bc1b2" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Oct 04 11:01:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 11:01:31 2023 +0000" }, "message": "Merge \"Refactoring recovery related code\" into main am: c41f52c34f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765105\n\nChange-Id: I3a9d9b4aa5fc7006eaf515403f234bba582b7377\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c41f52c34fda9843e6b10277d0861447e16bc1b2", "tree": "e6a06a829945273be8ac7630a49e9d635583ab9d", "parents": [ "71a82818ae7b3d58c77f4e2737dfcc88af8a641e", "8024a3afacaaa662f5a0792a4ced74a9e0402a4c" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Oct 04 10:26:42 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 04 10:26:42 2023 +0000" }, "message": "Merge \"Refactoring recovery related code\" into main" }, { "commit": "8fa0eac6e6e227f7a4d5793a3c75bbdc15710e33", "tree": "bbb22ab40652cf4f1996f26b4171dca89eb4d39e", "parents": [ "4b6040a5a19a366089f2c12b39c57ac421b9468c", "b4cb64104e36686f0da486dfd2773c83a778b26c" ], "author": { "name": "Alex Johnston", "email": "acjohnston@google.com", "time": "Wed Oct 04 08:40:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 08:40:17 2023 +0000" }, "message": "Merge \"Make getCredentialManagerPolicy user handle aware\" into udc-dev am: b545d60ef7 am: b4cb64104e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24419913\n\nChange-Id: Ibdcb184dc171bc82e0886a32c0a29a10eb33fcfe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ae48c7de08958965bda051ae53da1e59600fd5f1", "tree": "c6f1078d3f0c67d9fa235632f5a66dcabe8344b6", "parents": [ "ae3bf11f5beef341adab0a3300ab517f42021213", "39b11acd16eb6c628f29d966ced31dcf3d417f1e" ], "author": { "name": "Alex Johnston", "email": "acjohnston@google.com", "time": "Wed Oct 04 08:24:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 08:24:47 2023 +0000" }, "message": "Merge \"Make getCredentialManagerPolicy user handle aware\" into udc-qpr-dev am: 39b11acd16\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24905529\n\nChange-Id: If82fef0f2b0f648c658941ee5b5b28d095ddb356\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b4cb64104e36686f0da486dfd2773c83a778b26c", "tree": "9a9d0bcf2652271351d3017239de8f38680f721e", "parents": [ "02c82fe802e9c1fee292ecfde640f450874b437a", "b545d60ef7a995c767141245a3f291e5f2101f4d" ], "author": { "name": "Alex Johnston", "email": "acjohnston@google.com", "time": "Wed Oct 04 08:23:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 08:23:58 2023 +0000" }, "message": "Merge \"Make getCredentialManagerPolicy user handle aware\" into udc-dev am: b545d60ef7\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24419913\n\nChange-Id: Ifa0d955f12031b5989a4a01557974bb332d2bde9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4ed2591d47d515a89930cec1322d35e9d0a01f9a", "tree": "698a5ec21a3dc600a45d80884715182382ac9a36", "parents": [ "ffb3a20b9f0ee1bc55b15962c9d6e12fe7f8057f", "b545d60ef7a995c767141245a3f291e5f2101f4d" ], "author": { "name": "Alex Johnston", "email": "acjohnston@google.com", "time": "Wed Oct 04 08:22:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 08:22:50 2023 +0000" }, "message": "Merge \"Make getCredentialManagerPolicy user handle aware\" into udc-dev am: b545d60ef7\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24419913\n\nChange-Id: I1f928ff815bd50e08564ee2255dfb2010f3eab98\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b545d60ef7a995c767141245a3f291e5f2101f4d", "tree": "b91b0a641ea2c99af6e01a66c1ecc670b717772f", "parents": [ "92c1d53ff7797d809224ee5733e5a350ad939bd3", "0951b28bd94a514eded9503d802228a3591579d6" ], "author": { "name": "Alex Johnston", "email": "acjohnston@google.com", "time": "Wed Oct 04 07:55:25 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 04 07:55:25 2023 +0000" }, "message": "Merge \"Make getCredentialManagerPolicy user handle aware\" into udc-dev" }, { "commit": "39b11acd16eb6c628f29d966ced31dcf3d417f1e", "tree": "e5872b4a92320459e6287fbe47706d0846ada3ad", "parents": [ "05e37a0ae2047c7f98261b5549cf665588025cae", "6b51ca2ba8975f29e0eb4d09106958be60313772" ], "author": { "name": "Alex Johnston", "email": "acjohnston@google.com", "time": "Wed Oct 04 07:53:38 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 04 07:53:38 2023 +0000" }, "message": "Merge \"Make getCredentialManagerPolicy user handle aware\" into udc-qpr-dev" }, { "commit": "f2950c7a4105e64bea2659d4e275d539cf2591eb", "tree": "a4049f35c2e0b1c3ded2166dd5e0af8a74b01d77", "parents": [ "a4499a72845caa2c50d96b200b28f6873936d92b", "a74b123057e05c1524ad83833a8a1ec667c57642" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 04:53:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 04:53:40 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: fe967cb3b4 am: aaaf2b6cec am: 820883f26e am: a74b123057\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: I395cf5fb9d5eef2d3b45367b38508a904abe1637\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "df661ad61f61186c42bcb3b8716f4f87f014ac49", "tree": "8b582337db050657128f142c91155b0be841b123", "parents": [ "9e9cdd8efe6e0bf7ea6a654b61fa839e8cbca45c", "820883f26ed422588c752da96b2c50913babf678" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 04:21:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 04:21:28 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: fe967cb3b4 am: aaaf2b6cec am: 820883f26e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: Ib0c86a4e3fc075337a425de1c4330c754fd0215e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a74b123057e05c1524ad83833a8a1ec667c57642", "tree": "424b01ccc738c6c888ca3ca4132197836f117197", "parents": [ "4b6748bf082c1da447dec507355cb49a0cbac38d", "820883f26ed422588c752da96b2c50913babf678" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 04:20:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 04:20:03 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: fe967cb3b4 am: aaaf2b6cec am: 820883f26e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: I1c4aa117e364be19d17b72daf1d2c10d19d0c165\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "be52c69f199dd4eb0c10e962551221aa1a5b8198", "tree": "a51a219098106673355e23988bb083885425509b", "parents": [ "72596e219787c8d7802ad074d1a55dfee39367c1", "aaaf2b6cecb61877d0b1d31db14d18173a60951f" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 03:48:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 03:48:55 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: fe967cb3b4 am: aaaf2b6cec\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: Iff599e0d0d489c088cf9c1a80650fc5550aec2ac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "820883f26ed422588c752da96b2c50913babf678", "tree": "95a96be4904eb1202b38e4b6cad7afb48347c9f0", "parents": [ "581a3fe494325b9f7b15ec9e7f0d901742bafa54", "aaaf2b6cecb61877d0b1d31db14d18173a60951f" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 03:47:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 03:47:49 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: fe967cb3b4 am: aaaf2b6cec\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: I1f952e17b82385c0e9312a2260fc18891512a112\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aaaf2b6cecb61877d0b1d31db14d18173a60951f", "tree": "5f0befe35ad2d75b92afb08a3b9069110bce367a", "parents": [ "db65e4d5b8c3757f923e3f447d53875dfb84a8e7", "fe967cb3b4c6b65d157addb8f3a0699d0f3031bc" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 03:19:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 03:19:25 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: fe967cb3b4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: I79f0aa966ed5581df2121dbec54c5f9fd32c2257\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9991339676dd38021211b59e3f0e906352bc4e1e", "tree": "1744f9efd0c1b570267dec513b6bb3a8299470e3", "parents": [ "5cf809251b90f592f6ee22d713a0d83694a4f099", "7ffa627afcf77618715aec7cf497972463a2afbc" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 03:16:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 03:16:14 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: 7ffa627afc\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: I5e64d87b537e51d047e094b72a17dcbaeb164087\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7ffa627afcf77618715aec7cf497972463a2afbc", "tree": "518603ed28bf11e55bef2f021050993fef95d5d5", "parents": [ "fe385872d40095bc7e65b124fba6bb449d6b10cd", "632a8b8a439419a26923919e9ba3c81f075dfc93" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 02:44:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 02:44:49 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: I83806e724aee5862d5ccabe86252a87e35163f1f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fe967cb3b4c6b65d157addb8f3a0699d0f3031bc", "tree": "15ee005dd2fd8e3ca9dea4053bf01f5562354fa6", "parents": [ "b73ed7113f22b673b743a5efa980d14f7544cb71", "632a8b8a439419a26923919e9ba3c81f075dfc93" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 02:44:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 02:44:31 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: Ibf4efed382f979ced48f7fda9335344faa36472b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "632a8b8a439419a26923919e9ba3c81f075dfc93", "tree": "81b8cbadc05ea7896a313269474568465fb54bb0", "parents": [ "99a7448b5b2b29f7b591894edeb68cf9f63c2382", "264a36f6d02e2b8f7675f4fe44a6e710eac4a1f6" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 01:56:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 01:56:36 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: Iaf567db3c1f6f7a2e2f154efbeeefe259fb2e342\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4b6748bf082c1da447dec507355cb49a0cbac38d", "tree": "ad5546374259b806bfcae22c76ad49a7961e39d2", "parents": [ "d59d2a5842333d0114fa7a05afdfda8d792c4ee9", "72596e219787c8d7802ad074d1a55dfee39367c1" ], "author": { "name": "Beth Thibodeau", "email": "ethibodeau@google.com", "time": "Wed Oct 04 01:26:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 01:26:52 2023 +0000" }, "message": "Merge \"Check URI permissions for resumable media artwork\" into udc-dev-plus-aosp am: 72596e2197\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24802586\n\nChange-Id: I748425bc91b1c7b3c09c5211cbeb7ed4936559de\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "264a36f6d02e2b8f7675f4fe44a6e710eac4a1f6", "tree": "a1cb259a3c1f0ec22c5d1b0295e673ec93222368", "parents": [ "be822171e8a0203f8c5fb8e58b979dfa2a160577", "868bc803ff0bb4200263204542c369c8ff5724b5" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 01:25:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 01:25:18 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: I6637c61799e63de1ffe9e805dd99b28c65bb70dd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "72596e219787c8d7802ad074d1a55dfee39367c1", "tree": "b369c1c46499f1318f5015eff08daa0328cccd5f", "parents": [ "82d877664bc4cac9e7312e72aeab8fcb8daed20f", "18beea717eb4a99eda55a0d913120f594adb1cb2" ], "author": { "name": "Beth Thibodeau", "email": "ethibodeau@google.com", "time": "Wed Oct 04 00:53:32 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 04 00:53:32 2023 +0000" }, "message": "Merge \"Check URI permissions for resumable media artwork\" into udc-dev-plus-aosp" }, { "commit": "868bc803ff0bb4200263204542c369c8ff5724b5", "tree": "f756417ad2c858b5cdffea81c3eeab38e3fc049d", "parents": [ "8efa785f9bc51ab78c767f599075f9e354968339", "8f6b8d313d9c005b34be7dda9b41b7f9c97cd673" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 00:40:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 00:40:33 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: Ibb59b8e6a61f60ddf4c45ebece8814a82fc89fdf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8f6b8d313d9c005b34be7dda9b41b7f9c97cd673", "tree": "2e8612b880cf1e18155ab58ddf44079432b27d6a", "parents": [ "af9de2e62c3a2d2c4be11c7b1170758cdf731c89", "ca34073d93570ae83f26b7d098f37d57d37be7ee" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Wed Oct 04 00:06:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 00:06:56 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a am: ca34073d93\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: If1714cbfb29550144f9bd663baf2504290a2c71b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ca34073d93570ae83f26b7d098f37d57d37be7ee", "tree": "fe766850cbc17a36ae2cbac6c862e759bc69c272", "parents": [ "4f8e0db44fc29c3dc15801956394a8ce984e8cf6", "7c905e103aae7e37a32d6330778dbe6d09383942" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Tue Oct 03 23:21:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 23:21:20 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev am: 7c905e103a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24058898\n\nChange-Id: Iea462e7f2dbeaa3e448cb3da33e5ad8684041495\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7c905e103aae7e37a32d6330778dbe6d09383942", "tree": "4c0c585ec3781766815f3341fbcbe1989c200cd9", "parents": [ "ba7a30e9f1f597997ebf699f5fdd696ec2631c54", "3ef3f18ba3094c4cc4f954ba23d1da421f9ca8b0" ], "author": { "name": "Kunal Malhotra", "email": "malhk@google.com", "time": "Tue Oct 03 22:58:20 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 03 22:58:20 2023 +0000" }, "message": "Merge \"Adding in verification of calling UID in onShellCommand\" into rvc-dev" }, { "commit": "17b4923a3149a1e1aeebaf331ea96b7087e8e77f", "tree": "feb88210b8a5251e2e1e0db9c89abaaa141b1de8", "parents": [ "b678df8fb24ac3e115cdd903d7fe008822d7c145", "d4e102c21ae6b8162cdaa952c48e4b7939e6e17c" ], "author": { "name": "Juan Yescas", "email": "jyescas@google.com", "time": "Tue Oct 03 21:42:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 21:42:46 2023 +0000" }, "message": "Merge \"16k: Get the page size dynamically\" into main am: 1a69b9e991 am: 9981aced5a am: ebd0e3910a am: d4e102c21a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2768551\n\nChange-Id: Ibc98a76b84753c34eb0e14ec12fbe2de6b67f8e7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d4e102c21ae6b8162cdaa952c48e4b7939e6e17c", "tree": "ebd4bb0ae7339995d223ae0873f3cc925e18da04", "parents": [ "8c5e5f1aad0016e8a5732859e559238660800180", "ebd0e3910ad47d34c5ec0fabdddc45318356d6a2" ], "author": { "name": "Juan Yescas", "email": "jyescas@google.com", "time": "Tue Oct 03 21:10:11 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 21:10:11 2023 +0000" }, "message": "Merge \"16k: Get the page size dynamically\" into main am: 1a69b9e991 am: 9981aced5a am: ebd0e3910a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2768551\n\nChange-Id: I1ebc3a31d56f8d706c47d6463fe8a11395a2b499\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ebd0e3910ad47d34c5ec0fabdddc45318356d6a2", "tree": "a34dc7f6b26864bccfe812c6c0d7be23bc0eba43", "parents": [ "2e47cdaad3886fae5322009a8c1ecd353b544a29", "9981aced5af430bf9b8a32485f7680ff04777995" ], "author": { "name": "Juan Yescas", "email": "jyescas@google.com", "time": "Tue Oct 03 20:39:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 20:39:34 2023 +0000" }, "message": "Merge \"16k: Get the page size dynamically\" into main am: 1a69b9e991 am: 9981aced5a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2768551\n\nChange-Id: I4b771acdc7442361438377521707f76e1a6d4a96\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9981aced5af430bf9b8a32485f7680ff04777995", "tree": "54bfb4cac8b1ff8dafdbbdac2496f6c06dcda79f", "parents": [ "ff4aaec1f10f7520edcdeb22075308ac6e335db8", "1a69b9e991f3d34b9f873e42135e4794c7f37165" ], "author": { "name": "Juan Yescas", "email": "jyescas@google.com", "time": "Tue Oct 03 20:09:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 20:09:16 2023 +0000" }, "message": "Merge \"16k: Get the page size dynamically\" into main am: 1a69b9e991\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2768551\n\nChange-Id: Ibd44be6341971ab38dded54c3d7d9b9821955f63\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9c2c7a8dbcbf006e591e21b83b2b458f1634e233", "tree": "b0211ac40e590838ffeb4e24e527f909a73145ec", "parents": [ "198a4943b63629b9e8019c44e80778706369f344", "dc0fc846ae1f2112b6bea7b1ee71796afbc4145d" ], "author": { "name": "Andy Yu", "email": "chingtangyu@google.com", "time": "Tue Oct 03 18:47:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 18:47:47 2023 +0000" }, "message": "Remove FrameRate Enum to allow all possible frame rate values am: 026a007fe4 am: 6ef547434b am: dc0fc846ae\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24922792\n\nChange-Id: Ic395dff08a8ca797510c73a23b05558deaac375e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ede8dfc4b590fc53bcc0c43c73920e3e50b26d06", "tree": "a216dc531dfa9027aad0d0f48f1ea1a24b4be321", "parents": [ "d8e470a581a61552c0af76bb82fe3cc8d36e1852", "6ef547434b7b1b59b7e61d930012df3e413908a0" ], "author": { "name": "Andy Yu", "email": "chingtangyu@google.com", "time": "Tue Oct 03 18:16:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 18:16:04 2023 +0000" }, "message": "Remove FrameRate Enum to allow all possible frame rate values am: 026a007fe4 am: 6ef547434b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24922792\n\nChange-Id: I958d1e82a2457e2687549cb153fe71872dbc011f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dc0fc846ae1f2112b6bea7b1ee71796afbc4145d", "tree": "bd5d48900a39b514c7b59fe342e5b7cd396a2745", "parents": [ "a0d220745bf11b7303069186bfc7c9722a008906", "6ef547434b7b1b59b7e61d930012df3e413908a0" ], "author": { "name": "Andy Yu", "email": "chingtangyu@google.com", "time": "Tue Oct 03 18:14:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 18:14:58 2023 +0000" }, "message": "Remove FrameRate Enum to allow all possible frame rate values am: 026a007fe4 am: 6ef547434b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24922792\n\nChange-Id: I0989136a8fa3d3e1fd3f753dca1b70613f81d275\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6ef547434b7b1b59b7e61d930012df3e413908a0", "tree": "f48c6ce6067273a5d7078390467f424be8ceafeb", "parents": [ "1a0070030bf2dd34c557c0dd2975c2977a297fe1", "026a007fe4365ef5b1765d1e7c4e994b038a97e1" ], "author": { "name": "Andy Yu", "email": "chingtangyu@google.com", "time": "Tue Oct 03 17:44:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 17:44:49 2023 +0000" }, "message": "Remove FrameRate Enum to allow all possible frame rate values am: 026a007fe4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24922792\n\nChange-Id: I0489564f168ce15799edc83453f41803a72dc397\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ce91a2a74249d41ebc3239110a33a086349efcd2", "tree": "7385dce110b2565781a01ada0ac242a2a3419718", "parents": [ "6958a77825a9bbedd624624714b86eadafcc461c" ], "author": { "name": "Juan Yescas", "email": "jyescas@google.com", "time": "Mon Oct 02 12:50:53 2023 -0700" }, "committer": { "name": "Juan Yescas", "email": "jyescas@google.com", "time": "Tue Oct 03 15:59:37 2023 +0000" }, "message": "16k: Get the page size dynamically\n\nAndroid V will support page size agnostic targets. For\nframeworks, getpagesize() will be used instead of the\nhardcoded value for page size.\n\nBug: 298041921\nTest: source build/envsetup.sh\n lunch aosp_cf_arm64_phone_pgagnostic\n m\nChange-Id: I62c94da767a79df9515d5b9cbb93764508a0f023\n" }, { "commit": "8024a3afacaaa662f5a0792a4ced74a9e0402a4c", "tree": "5525140c69d85bd3b1b1da8efc94c9ffdc00615a", "parents": [ "2768c06f7a8723505cea678706900cbd5f91e615" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Sep 27 15:36:29 2023 +0000" }, "committer": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Tue Oct 03 14:25:28 2023 +0000" }, "message": "Refactoring recovery related code\n\nIn modules, we could only use Public and SystemAPI for interaction.\nRefactoring to meet that criteria. This does not change any functionality.\n1. Moving unsupported async Handler creation to public api\n2. Getting System user handle using SystemApi\n\nBug: b/289203818\nTest: m\n\nChange-Id: Ib2bdfaade3a930dd549bee25b044e4f64d13f400\n" } ], "next": "c635c7226f7455b73d0e14807679d0a7c30faf97" }