Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,686 Commits 3 Branches 0 Tags
9ed71acfb1fe3f612fcabd3c25bd2382dadf37f1
Commit Graph

651686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuri Lin
9ed71acfb1 [automerge] Trim any long string inputs that come in to AutomaticZenRule 2p: 19bc2c3559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816496

Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Change-Id: Ifbf41438485e2061ab2e9aaba375cb420ae1fb80
Merged-In: I110172a43f28528dd274b3b346eb29c3796ff2c6
 2022-09-01 18:52:10 +00:00
Yuri Lin
19bc2c3559 Trim any long string inputs that come in to AutomaticZenRule 
This change both prevents any rules from being unable to be written to disk and also avoids risk of running out of memory while handling all the zen rules.

Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Test: cts AutomaticZenRuleTest; atest android.app.AutomaticZenRuleTest; manually confirmed each exploit example either saves the rule successfully with a truncated string (in the case of name & conditionId) or may fail to save the rule at all (if the owner/configactivity is invalid). Additionally ran the memory-exhausting PoC without device crashes.

Change-Id: I110172a43f28528dd274b3b346eb29c3796ff2c6
Merged-In: I110172a43f28528dd274b3b346eb29c3796ff2c6
(cherry picked from commit de172ba0d4)
 2022-09-01 18:51:55 +00:00
Ganesh Olekar
708c29db10 Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-dev am: 391cabb10c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500370

Change-Id: I232c558d5bc9dc38cb85121584d5db404dcb4555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-29 17:56:39 +00:00
Ganesh Olekar
391cabb10c Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-dev 2022-08-29 17:38:00 +00:00
Ganesh Olekar
367d37a935 Merge changes from topic "scdevbug" into sc-qpr1-dev 
* changes:
  [automerge] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q 2p: 23aac9cb8e
  DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q
 2022-08-29 17:37:59 +00:00
TreeHugger Robot
45b66cfb9a Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into sc-dev am: 6457ae8d4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697196

Change-Id: I9e9aff53dd5c38c32f247ef0f67b843f29505f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 16:19:19 +00:00
TreeHugger Robot
6457ae8d4c Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into sc-dev 2022-08-26 15:57:05 +00:00
TreeHugger Robot
06bbfe7df1 Merge changes from topic "presubmit-am-05344ff48efd40fb998cae56f5a842b0-sc-dev" into sc-qpr1-dev 
* changes:
  [automerge] Limit the size of NotificationChannel and NotificationChannelGroup 2p: b664159aa8
  Limit the size of NotificationChannel and NotificationChannelGroup
 2022-08-26 15:57:04 +00:00
Ganesh Olekar
07acb763a7 [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-dev am: 1ee3c74d2e am: 362c47c6e7 -s ours am: d06f5f0f74 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125210

Change-Id: I11befc21cd24a1e998d6c5ea786cf6fcf043e336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:14:11 +00:00
Ganesh Olekar
dab9b6f655 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: f11f26c012 -s ours am: eee34d1470 -s ours am: 45db391cd7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125210

Change-Id: Icede839f17e3c22d910faa6d939b438f2133dfd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 23:14:09 +00:00
Ganesh Olekar
d06f5f0f74 [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-dev am: 1ee3c74d2e am: 362c47c6e7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125210

Change-Id: I8244d46faefb469e6e185971fb5c0688b231b4ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:55:53 +00:00
Ganesh Olekar
45db391cd7 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: f11f26c012 -s ours am: eee34d1470 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125210

Change-Id: Idd448dc449679e49428e575c42c646f9f97e95f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:55:34 +00:00
Ganesh Olekar
362c47c6e7 Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-dev am: 1ee3c74d2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125210

Change-Id: If8f74572f8ef361695b8c239d0382587df6b7cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:29:01 +00:00
Ganesh Olekar
eee34d1470 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: f11f26c012 -s ours 
am skip reason: skipped by user olekarg

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125210

Change-Id: I6f09e58ede6866dcf3046c92371ccad160adbe49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:28:55 +00:00
Ganesh Olekar
1ee3c74d2e Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-dev 2022-08-24 20:46:33 +00:00
Ganesh Olekar
9d383010c5 [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-qpr-dev am: 29a03aa05c -s ours am: 706fdb063a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908

Change-Id: I23f4c219774ac1a8e5135d630a97baebcd5da9be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:41:23 +00:00
Ganesh Olekar
4546e81fae [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: d4d6b18e3a -s ours am: a3281827dd -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908

Change-Id: I02da3004b50a4ed5dde894d64c618823eb242364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:41:21 +00:00
Ganesh Olekar
706fdb063a [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-qpr-dev am: 29a03aa05c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908

Change-Id: If278b4e9f6b907957412bd58c2965bd3ca0f52ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:14:06 +00:00
Ganesh Olekar
a3281827dd [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: d4d6b18e3a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908

Change-Id: I1e822423715437f7b1f070609b83366b0f379ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:13:45 +00:00
Ganesh Olekar
29a03aa05c Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-qpr-dev 2022-08-24 16:55:00 +00:00
Oli Lan
514eaefa2c [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979

Change-Id: I88aa0aeb8d7757a8dcea43daf8e172b17738761f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 16:33:14 +00:00
Oli Lan
8af031ff0e [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979

Change-Id: Icd1374a65adef49d9556459adc8fe22f1ca72a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 16:32:59 +00:00
Oli Lan
df9c2c7df0 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979

Change-Id: Iaf14c2ee5ca03f12c612274e13bc3ea4ba2819ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 16:05:40 +00:00
Oli Lan
8a71c13c4a [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979

Change-Id: I6fee539b9773953ab0331a18c76b247434e188b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 16:05:24 +00:00
Oli Lan
fee26edc80 Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390

Change-Id: I4a9f948597f9665a10f0e3c33fecf55e4e6a8dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 15:26:10 +00:00
Oli Lan
4bbf0d99f4 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979

Change-Id: I07757cbf0fe2e8884f4eb144b544eee5f71e2d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 15:21:52 +00:00
Oli Lan
1f3cf27c90 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979

Change-Id: I3155b21cc4bd5fe99e0705ebe49af1ed2426468a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 15:19:14 +00:00
Oli Lan
916d292b28 Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390

Change-Id: I1ec159aa8dcb340b462a4ad718c0fc8bb67f4377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 14:53:08 +00:00
Oli Lan
35868459ce [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979

Change-Id: Ib26ed490a4e9432ed48db06edf478b6dbccfe65f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 14:53:06 +00:00
Oli Lan
4523b61a18 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979

Change-Id: I78acf86f8897a697068ea610e2382aae25c9df09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 14:52:39 +00:00
Oli Lan
02101eec31 Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979

Change-Id: Ibdc5b1a989999ce369329158227f766ac7c0e1f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 14:25:50 +00:00
Oli Lan
4c5aaf952b RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979

Change-Id: I57b5bdc0fe501fd27516f3f9ea3c156aa6da6c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 14:25:46 +00:00
Oli Lan
476be4be3c Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390

Change-Id: I2bbb9bdd9f662be36a205565450282429fb58c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 14:25:15 +00:00
Oli Lan
71fad59e5e Merge "Prevent non-admin users from deleting system apps." into rvc-dev 2022-08-24 13:37:19 +00:00
Oli Lan
adafc9cb0f Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev 2022-08-24 13:37:04 +00:00
Julia Reynolds
fbe0eddf01 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours 
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I4432ee0eaf6e523cb98cd578d7c4ae77747130f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 21:24:06 +00:00
Julia Reynolds
64c3c93c8c Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 am: 6155a1779b am: c08dd8f0a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: If54a305ad52e9c8d7d6d96849c08722a6b063007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 21:20:20 +00:00
Julia Reynolds
bf77efaa37 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours 
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: If9221962db022d96fc24b8cf69e38577dbf375ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:51:26 +00:00
Julia Reynolds
c08dd8f0a8 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 am: 6155a1779b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: Ie8d9d0bfee0236a15f697e0d91c0b2b6a7280946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:50:29 +00:00
Julia Reynolds
dc9fe11d8d Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 am: 5415ede546 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: I0d2e6623563ec9b74ee4c3356384750a97b347c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 19:11:50 +00:00
Julia Reynolds
a85f1fe58d [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours 
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I06dd40128c2853a96ebf16155c330fe6f9fc6643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 19:02:15 +00:00
Julia Reynolds
6155a1779b Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: I3a4799fe094aee9a0694ed6df5b8587a5a2f7c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 19:01:58 +00:00
Julia Reynolds
7d9c55fd15 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours 
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I6ca536a1e387ab2df802df9bfb4ed2e504154ddc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 19:01:51 +00:00
Julia Reynolds
5415ede546 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: I1079b5d5ae03e517d83d1224023cd7ba89c37605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 18:53:53 +00:00
Julia Reynolds
f1c5754b97 Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: Ida57571c08e6c1be93b7b70adff8fce3759c109a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 18:44:15 +00:00
Julia Reynolds
04ccf69df1 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev 2022-08-23 18:41:17 +00:00
Julia Reynolds
a15093de05 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev 2022-08-23 18:40:15 +00:00
Julia Reynolds
c2d264989a Limit the size of NotificationChannel and NotificationChannelGroup 
Test: android.app.NotificationChannelGroupTest
Test: android.app.NotificationChannelTest
Test: cts NotificationChannelTest
Test: cts NotificationChannelGroupTest
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I0925583ab54d6c81c415859618f6b907ab7baada
Merged-In: I0925583ab54d6c81c415859618f6b907ab7baada
(cherry picked from commit 3850857cb0)
 2022-08-23 13:22:33 +00:00
TreeHugger Robot
066e4983c0 [automerger skipped] [conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am: dedf573b23 am: a8fe3a8f50 -s ours am: 87755b712a -s ours am: e718b4ef20 -s ours am: cc809ffb8a -s ours 
am skip reason: Merged-In I62a875e26e214847ec72ce3c41b4f2fa8e597e07 with SHA-1 a367c0a16a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19680844

Change-Id: Icde2f991fdb5c975a906fb638c5baf18788b2a87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 22:27:42 +00:00
TreeHugger Robot
cc809ffb8a [automerger skipped] [conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am: dedf573b23 am: a8fe3a8f50 -s ours am: 87755b712a -s ours am: e718b4ef20 -s ours 
am skip reason: Merged-In I62a875e26e214847ec72ce3c41b4f2fa8e597e07 with SHA-1 a367c0a16a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19680844

Change-Id: I9ce9cd1ec78eafb8a66ddc09a6af77bac75ccd30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 22:07:58 +00:00