Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
499,480 Commits 3 Branches 0 Tags
476be4be3c30d2a1779da10bd22748bf003641e6
Commit Graph

499480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
e718b4ef20 [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 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: I35814b3bd0ef8796f4643ed1010846803557cb8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 21:49:06 +00:00
TreeHugger Robot
87755b712a [automerger skipped] [conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am: dedf573b23 am: a8fe3a8f50 -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: I5de4f2f5b016828231f035aa045a8faf3849d805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 21:30:32 +00:00
Julia Reynolds
6d417539d7 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
(cherry picked from commit 3850857cb0)
 2022-08-22 17:27:35 +00:00
Julia Reynolds
46f943383d 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
(cherry picked from commit 3850857cb0)
 2022-08-22 17:26:04 +00:00
TreeHugger Robot
a8fe3a8f50 [conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am: dedf573b23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19607760

Change-Id: I62ba986987ba4f490177e2e5bc4c981a8f4a8fe7
Merged-In: I62a875e26e214847ec72ce3c41b4f2fa8e597e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:22:44 +00:00
Iván Budnik
b6cff0c175 Merge "Enforce ComponentName belongs to caller app" into rvc-dev am: c4d258d8b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19497893

Change-Id: I8459e2027cccec768411b8be9d5b812647161bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 12:31:22 +00:00
Iván Budnik
c4d258d8b1 Merge "Enforce ComponentName belongs to caller app" into rvc-dev 2022-08-22 12:07:16 +00:00
TreeHugger Robot
dedf573b23 Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev 2022-08-20 02:34:14 +00:00
Daniel Norman
d000f2dbec Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I5c4c7fb48f58441c5cba498916ffb83191599141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 21:59:48 +00:00
Daniel Norman
f914ec1768 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev 2022-08-19 21:35:32 +00:00
Ganesh Olekar
64f36a1646 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib62452cfc4f33fc5e66ce5ae13f8f98031e057ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:50:59 +00:00
Ganesh Olekar
26f72ff555 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9581db45a6bbf1233af5b30be6dfc0ec1b2feec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:24:20 +00:00
Ganesh Olekar
e37a0ac9f8 DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q 
Test: Manually install app apks targeting Q and verifying that AR permission is not auto-granted
Test: atest ActivityRecognitionPermissionTest
Bug: 210065877
Change-Id: I90adf45a6611ab8bc953765c72af77a6a4f7aae8
(cherry picked from commit 84b1160cfc)
 2022-08-15 10:47:16 +00:00
Ganesh Olekar
e0cb2beeae [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours am: 0f8fc1a47e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibeda38633536962746a52ec868cdec0d6c3af581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 10:14:08 +00:00
Ganesh Olekar
6bfd59aabf [automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc am: 0a761a9510 -s ours am: 6732f3304f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3afaa8ec98a89c24b850e35699e0ce155629261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 10:13:47 +00:00
Ganesh Olekar
0f8fc1a47e [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic974d67a09adfde7137fac9d90b67d69f38133a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 09:55:28 +00:00
Ganesh Olekar
6732f3304f [automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc am: 0a761a9510 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7d552e9ede491bff1daf95515eea4d5b04e7cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 09:55:04 +00:00
Ganesh Olekar
dc45b9fed3 Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410

Change-Id: I782fb9a0fe395df6413d543b27812112a531cfea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 09:38:09 +00:00
Ganesh Olekar
0a761a9510 [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410

Change-Id: I439bf33ed4be4f0bf2439f5565b57c9bdc398504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 06:35:33 +00:00
Ganesh Olekar
e893eff6f2 Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev 2022-08-15 06:08:20 +00:00
Louis Chang
62767d9c63 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev am: 34f726089c -s ours 
am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 b9a9340645 is already in history

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

Change-Id: I3bd05469fbbc1f9de82b11850c9edf155aabcd0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 00:44:48 +00:00
Louis Chang
13d83ff367 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: 834812c423 -s ours 
am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 b9a9340645 is already in history

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

Change-Id: I23dabc778ae73387e01f8045e6e5e1276198a069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 00:44:32 +00:00
Louis Chang
34f726089c Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev 2022-08-15 00:21:27 +00:00
Daniel Norman
18f2ec86d6 Do not send AccessibilityEvent if notification is for different user. 
Bug: 237540408
Test: BuzzBeepBlinkTest#testA11yCrossUserEventNotSent
Change-Id: I62a875e26e214847ec72ce3c41b4f2fa8e597e07
Merged-In: I62a875e26e214847ec72ce3c41b4f2fa8e597e07
 2022-08-12 19:44:08 +00:00
Daniel Norman
a367c0a16a Do not send AccessibilityEvent if notification is for different user. 
Bug: 237540408
Test: BuzzBeepBlinkTest#testA11yCrossUserEventNotSent
Change-Id: I62a875e26e214847ec72ce3c41b4f2fa8e597e07
 2022-08-12 19:36:22 +00:00
TreeHugger Robot
201e93d899 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours am: 192f2e6360 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e3e4394a6658872b17d5cd4423cb8f8f8f8dcd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 17:06:40 +00:00
Louis Chang
7ca38bea98 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I53b370d38eee3f2c7986dea88390fb61e941c9e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 17:06:33 +00:00
TreeHugger Robot
192f2e6360 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37fb6ef29c8bf945b2d2201b71d18a8589effcf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:49:35 +00:00
Louis Chang
b38b3eaccb [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9334f8f8223d74767a6ae95f5e74a8c9abebfd0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:49:12 +00:00
TreeHugger Robot
b302dca798 Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948

Change-Id: I04e528e35f4c860b0f989e7c3e063a9bc5e23cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:17:37 +00:00
Louis Chang
53c6a79cfd [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948

Change-Id: I298a415227f87fa71a196cfad35c88319f265e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:17:21 +00:00
TreeHugger Robot
750c978db5 Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev 2022-08-11 15:41:19 +00:00
Yuri Lin
b93dab4bb9 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev am: 4d015c710d -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: I754fc047ab9b5834f905d538be92919042b12c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:26:26 +00:00
Yuri Lin
1efafda612 [automerger skipped] Enforce zen rule limit on a package level. am: 468dd54e8b -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: Iec40cec2312835a929ca162defc470f58bef44cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:26:05 +00:00
Louis Chang
b9a9340645 [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 
The new Intent was delivered to a non-exported activity while
#navigateUpTo was called from an Activity of a different uid.

Bug: 238605611
Test: atest StartActivityTests
Change-Id: I854dd825bfd9a2c08851980d480d1f3a177af6cf
Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf
 2022-08-11 02:03:47 +00:00
Louis Chang
834812c423 [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 
The new Intent was delivered to a non-exported activity while
#navigateUpTo was called from an Activity of a different uid.

Bug: 238605611
Test: atest StartActivityTests
Change-Id: I854dd825bfd9a2c08851980d480d1f3a177af6cf
Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf
 2022-08-11 02:03:07 +00:00
Yuri Lin
4d015c710d Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev 
* changes:
  Enforce zen rule limit on a package level.
  Fix NPE when deleting old zen rules
  Store DND rule owners
 2022-08-11 01:32:32 +00:00
Yuri Lin
a10aa3cc26 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e am: b618fee451 -s ours am: fa7e3ae758 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: I7ed464a5f7505f158170c100b9a078e9f426d488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:01:29 +00:00
Julia Reynolds
1cb919e374 [automerger skipped] Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff am: b953b5eff6 -s ours 
am skip reason: Merged-In I069fcc124af24227fa50b61d4fc55d6dadc7a20b with SHA-1 93aa03a0db is already in history

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

Change-Id: Iac92362c4a30230920b9803085d67aa9b39a300b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:01:17 +00:00
Julia Reynolds
d75bba0cec [automerger skipped] Store DND rule owners am: eda171cffa am: 1eaa443544 -s ours am: 8e552b10c7 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Ib5c9cd9eaeb1cb2aa350dff5403a41b88cdf9ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:01:01 +00:00
Yuri Lin
fa7e3ae758 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e am: b618fee451 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Idd8503674a3bae4d09df32d8668866e3e317af62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:21:20 +00:00