summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-07Snap for 11190379 from 849622fb6671fac638aba9ef259150816a3f09dd to ↵aml_con_341410300android14-mainline-conscrypt-releaseAndroid Build Coastguard Worker
mainline-conscrypt-release Change-Id: Ia878b9d2bd920b7b0054f88aca1d1e093c6a113f
2023-12-07Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prodBill Yi
2023-12-06Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prodTreehugger Robot
2023-12-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ieb81525409304744a310d38e1be7986b75dbe80b
2023-12-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ibb9dbe55622c82b27dbbf716dfa9945a00786a4b
2023-12-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iaa1d1249e6b5d4856bf4fe75fd4ff28a741a66b1
2023-12-05[automerger skipped] Merge "Handle screen capture disabled state for ↵Treehugger Robot
multiple users" into tm-dev am: 925eb31c07 am: 51ef433fd9 am: 8ef2cdc1e7 -s ours am: 1af69bd983 -s ours am skip reason: Merged-In I9da7b026e937a9e729777b4de613b319a4084418 with SHA-1 3b2c9426e4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286 Change-Id: I30a73900b6f3ba146b483377ce55efe75a5a4eff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into ↵Eric Laurent
sc-dev am: 840901500e -s ours am: 680709cf3d -s ours am: 39a185c6ba -s ours am: 55d75e3bc5 -s ours am: 3c9d83d9bf -s ours am: 3a57ab91bf -s ours am: 1f37c433c1 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I36ecce3e8b019c3db97200ca26a9927a8fcff14a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
05abf2ce0a -s ours am: 90b514ec38 -s ours am: 4e8c2f4410 -s ours am: 8cab8146f9 -s ours am: 706c85ca3c -s ours am: 670bca2da3 -s ours am: fb87cb8af4 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I70bd576c315a81bfb3b908cdab8a5765e3f1f790 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" ↵Eric Laurent
into sc-qpr1-dev am: fefdc2b7de -s ours am: 09eece1912 -s ours am: 5029b24ea3 -s ours am: 757e33e5a8 -s ours am: 503812be67 -s ours am: 15e37dc8d4 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I6d6d94c141c3f8bbf3eb107dab0a47332ed8836b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
ddf629a3fd -s ours am: d218e10bf0 -s ours am: 0af89c307c -s ours am: b54f6807f0 -s ours am: 85ca454790 -s ours am: d70197cdfb -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I0d8d46903bbe0c1bc98974adcd08d833e0947d39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" ↵Eric Laurent
into sc-v2-dev am: 84152b1577 -s ours am: b770486c8f -s ours am: 2948299260 -s ours am: a828a09221 -s ours am: 7e932923ad -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: If7331465a9eed7cab037310e863d6160d9fe3fe9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
787a07d969 -s ours am: 0e17ca6913 -s ours am: 585d6b8b6f -s ours am: 446621b4b1 -s ours am: a85a29c3a6 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: I2e60aacb24a53390c728cbd06c10d877d4688974 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_tm_dev" into ↵Eric Laurent
tm-dev am: 47007e641f am: ff08b3c55f -s ours am: 0608126ded -s ours am: 9eb1a5c10a -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 665342c517 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240035 Change-Id: Ia17a05a400763320962521f8d299779326f3ac42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: ↵Vlad Popa
41f08b8d70 am: c84fa21c39 -s ours am: 7f9ab55f6e -s ours am: fcb247e460 -s ours am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 ada3f60412 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240034 Change-Id: I913fe6ad4f0f7003d271f78095f62fd0b5ab1dc2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "[DO NOT MERGE] Enforce persisted snoozed ↵Treehugger Robot
notifications limits" into rvc-dev am: 2b9e13fb28 am: 7ee867d8eb -s ours am: 42a324e555 -s ours am: 08b86ffd37 -s ours am: baecf65e85 -s ours am: 0e26bd6dc1 -s ours am: f39f6ae94b -s ours am: fbe2646202 -s ours am: 1e80727844 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25369997 Change-Id: I30f88394ba06c85481434dd597ede996695af034 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] [DO NOT MERGE] Enforce persisted snoozed notifications ↵Valentin Iftime
limits am: 87c11b6df3 am: 42871c8c73 -s ours am: 66b1cc3ab0 -s ours am: 9465ba74fa -s ours am: 65ef6c727b -s ours am: 6b4b09182b -s ours am: 9e9969ac5d -s ours am: 7086c82e2b -s ours am: 33a85c3ffb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25369997 Change-Id: Ic1d73bfb1c02d1242786b2ddae25464d4ed9fd77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] [conflict] Merge "Enforce persisted snoozed ↵Iavor-Valentin Iftime
notifications limits" into sc-dev am: 5ac423b8c2 am: 40272384d0 am: a596d7b2aa am: 772f6c9946 am: b41467e848 -s ours am: f3bcfc233e -s ours am: 9ab4a5424f -s ours am skip reason: skipped by user valiiftime Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25508273 Change-Id: I612419776df4897cf7c9f66a757c7ed077c22c7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "Handle screen capture disabled state for ↵Treehugger Robot
multiple users" into tm-dev am: 925eb31c07 am: 51ef433fd9 am: 8ef2cdc1e7 -s ours am skip reason: Merged-In I9da7b026e937a9e729777b4de613b319a4084418 with SHA-1 3b2c9426e4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286 Change-Id: Ibd4b4e505e4619dac34d84ef0a0ca05f7d94d82b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into ↵Eric Laurent
sc-dev am: 840901500e -s ours am: 680709cf3d -s ours am: 39a185c6ba -s ours am: 55d75e3bc5 -s ours am: 3c9d83d9bf -s ours am: 3a57ab91bf -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I367c979202e4722f54d28784274fffe4358b586a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
05abf2ce0a -s ours am: 90b514ec38 -s ours am: 4e8c2f4410 -s ours am: 8cab8146f9 -s ours am: 706c85ca3c -s ours am: 670bca2da3 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I0d00ea905720f119e3c36e44aca9576537bb5c14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" ↵Eric Laurent
into sc-qpr1-dev am: fefdc2b7de -s ours am: 09eece1912 -s ours am: 5029b24ea3 -s ours am: 757e33e5a8 -s ours am: 503812be67 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: Ia36ef4d3d0de6fe9233741a3b075ab111e3e525d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
ddf629a3fd -s ours am: d218e10bf0 -s ours am: 0af89c307c -s ours am: b54f6807f0 -s ours am: 85ca454790 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: Ib62bd4d764315515e61788ef166b494b0105e03c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" ↵Eric Laurent
into sc-v2-dev am: 84152b1577 -s ours am: b770486c8f -s ours am: 2948299260 -s ours am: a828a09221 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: I710f52ce80f0a2e096fe52a002158d35c29d778f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
787a07d969 -s ours am: 0e17ca6913 -s ours am: 585d6b8b6f -s ours am: 446621b4b1 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: I500156bad146741a4e34268b671b14071ff609c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_tm_dev" into ↵Eric Laurent
tm-dev am: 47007e641f am: ff08b3c55f -s ours am: 0608126ded -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 665342c517 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240035 Change-Id: I18867be92758c968d8f53c7990f4d8337868b76c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: ↵Vlad Popa
41f08b8d70 am: c84fa21c39 -s ours am: 7f9ab55f6e -s ours am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 ada3f60412 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240034 Change-Id: Ib091bd54ec750b854b3163f35c116bd5ecd33f3b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "[DO NOT MERGE] Enforce persisted snoozed ↵Treehugger Robot
notifications limits" into rvc-dev am: 2b9e13fb28 am: 7ee867d8eb -s ours am: 42a324e555 -s ours am: 08b86ffd37 -s ours am: baecf65e85 -s ours am: 0e26bd6dc1 -s ours am: f39f6ae94b -s ours am: fbe2646202 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25369997 Change-Id: Ib9b80efbfe74999a12d8d52123eade9e028aa4ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] [DO NOT MERGE] Enforce persisted snoozed notifications ↵Valentin Iftime
limits am: 87c11b6df3 am: 42871c8c73 -s ours am: 66b1cc3ab0 -s ours am: 9465ba74fa -s ours am: 65ef6c727b -s ours am: 6b4b09182b -s ours am: 9e9969ac5d -s ours am: 7086c82e2b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25369997 Change-Id: I229f2b9b02d4e74e0833a758f93228d0bbd24024 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] [conflict] Merge "Enforce persisted snoozed ↵Iavor-Valentin Iftime
notifications limits" into sc-dev am: 5ac423b8c2 am: 40272384d0 am: a596d7b2aa am: 772f6c9946 am: b41467e848 -s ours am: f3bcfc233e -s ours am skip reason: skipped by user valiiftime Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25508273 Change-Id: Ifcf1c0ee5708ae7cdc393e290dcdd2348111d4be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Handle screen capture disabled state for multiple users" into tm-dev ↵Treehugger Robot
am: 925eb31c07 am: 51ef433fd9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286 Change-Id: I0e9516621b788765005fba57027258bfae28029b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into ↵Eric Laurent
sc-dev am: 840901500e -s ours am: 680709cf3d -s ours am: 39a185c6ba -s ours am: 55d75e3bc5 -s ours am: 3c9d83d9bf -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I54c4447997a6d517bfefb901724166596bf5b34d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
05abf2ce0a -s ours am: 90b514ec38 -s ours am: 4e8c2f4410 -s ours am: 8cab8146f9 -s ours am: 706c85ca3c -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I89514a927bda16a56febfb8784e9421ddc97b314 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" ↵Eric Laurent
into sc-qpr1-dev am: fefdc2b7de -s ours am: 09eece1912 -s ours am: 5029b24ea3 -s ours am: 757e33e5a8 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I86e4abc0d0f29351d2235888715f35b7062f9abd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
ddf629a3fd -s ours am: d218e10bf0 -s ours am: 0af89c307c -s ours am: b54f6807f0 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I44577c4b16964ede10a8c8bd4954e5c9bb289e94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" ↵Eric Laurent
into sc-v2-dev am: 84152b1577 -s ours am: b770486c8f -s ours am: 2948299260 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: Id3bc1463ba4b4be0247fdf0330ce3352cade9954 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
787a07d969 -s ours am: 0e17ca6913 -s ours am: 585d6b8b6f -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: I5d4b0667d5da57e3d54069c3c14f5dcb4818511d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_tm_dev" into ↵Eric Laurent
tm-dev am: 47007e641f am: ff08b3c55f -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 665342c517 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240035 Change-Id: I842ada7f8781a58fb2fc19c88f9c67aa9c0c1726 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: ↵Vlad Popa
41f08b8d70 am: c84fa21c39 -s ours am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 ada3f60412 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240034 Change-Id: Icc716ef21993efdc0025cb963c606688e7c7e9d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "[DO NOT MERGE] Enforce persisted snoozed ↵Treehugger Robot
notifications limits" into rvc-dev am: 2b9e13fb28 am: 7ee867d8eb -s ours am: 42a324e555 -s ours am: 08b86ffd37 -s ours am: baecf65e85 -s ours am: 0e26bd6dc1 -s ours am: f39f6ae94b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25369997 Change-Id: I4b962079970e563bd4b132604c8a3882fc596129 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] [DO NOT MERGE] Enforce persisted snoozed notifications ↵Valentin Iftime
limits am: 87c11b6df3 am: 42871c8c73 -s ours am: 66b1cc3ab0 -s ours am: 9465ba74fa -s ours am: 65ef6c727b -s ours am: 6b4b09182b -s ours am: 9e9969ac5d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25369997 Change-Id: Ia3db466338c112c8ef4940a6756b4cbc2efad432 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] [conflict] Merge "Enforce persisted snoozed ↵Iavor-Valentin Iftime
notifications limits" into sc-dev am: 5ac423b8c2 am: 40272384d0 am: a596d7b2aa am: 772f6c9946 am: b41467e848 -s ours am skip reason: skipped by user valiiftime Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25508273 Change-Id: I4720fa1c3f899f210247645874d1b2f982f1a0a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "Handle screen capture disabled state for ↵Treehugger Robot
multiple users" into tm-dev am: 925eb31c07 am: 6932b02fb6 -s ours am: 2d25c9b0b5 -s ours am skip reason: Merged-In I9da7b026e937a9e729777b4de613b319a4084418 with SHA-1 3b2c9426e4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286 Change-Id: Ieb2a89645366fda1f90506805cfc329446ee0374 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "Handle screen capture disabled state for ↵Treehugger Robot
multiple users" into tm-dev am: 925eb31c07 am: 6932b02fb6 -s ours am skip reason: Merged-In I9da7b026e937a9e729777b4de613b319a4084418 with SHA-1 3b2c9426e4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286 Change-Id: If45434a2882db4b44c18254c85daed87c15566e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Handle screen capture disabled state for multiple users" into tm-dev ↵Treehugger Robot
am: 925eb31c07 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286 Change-Id: I84d83f9c0fbca1297531d7eee6b052b749a61063 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into ↵Eric Laurent
sc-dev am: 840901500e -s ours am: 680709cf3d -s ours am: 39a185c6ba -s ours am: 55d75e3bc5 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I4e22bd65bd70b9a8470e0e3f33e7264003bd0d96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
05abf2ce0a -s ours am: 90b514ec38 -s ours am: 4e8c2f4410 -s ours am: 8cab8146f9 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I780f2e883e1c106eeb18cdeb6a6d6df358f0f1a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" ↵Eric Laurent
into sc-qpr1-dev am: fefdc2b7de -s ours am: 09eece1912 -s ours am: 5029b24ea3 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I934bfaf03dacffc44850a08979f71c9996be079f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
ddf629a3fd -s ours am: d218e10bf0 -s ours am: 0af89c307c -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: Ibef6d47a2f745a98e6a8122cbdecf37837f3a230 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" ↵Eric Laurent
into sc-v2-dev am: 84152b1577 -s ours am: b770486c8f -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: Ifb113bdb9835aba9f92b0c326e83d1bbadd2c712 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 07:57:20 +0000