Commit Graph

848259 Commits

Author SHA1 Message Date
Yuri Lin
481d4ce9db [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 3bba7fb184 am: b203e9f9c2 -s ours am: caf62df2b1 -s ours am: 84ea6eecda -s ours am: 6fbfe4cd05 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12eb8e02d95efbe53a412a1da486a765a102b2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:15:47 +00:00
Yuri Lin
c3f2f9c44a [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-dev am: 1585f7c77d -s ours am: f80526cbef -s ours am: 11aed95336 -s ours am: a5283fc065 -s ours am: 63e80f94bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id8a775f05d197ed68dcddc1c25752b7bb3e980de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:15:11 +00:00
Yuri Lin
758866373f [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7deb6e4565 -s ours am: 6fbb8bd7f2 -s ours am: b22722a0f3 -s ours am: c84ac8093c -s ours am: 113483da7d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I826fbe04712152e30744d3f6c42a239fdf938f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:14:59 +00:00
Yuri Lin
25396167aa [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into sc-qpr1-dev am: 15b2a7d593 -s ours am: 0b49769300 -s ours am: d5b2053362 -s ours am: fc02d92db2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia806ebb575a93bfa5be2dafa46062ed59a9372bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:14:12 +00:00
Yuri Lin
e8cf9e4893 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 8c21e3f5cb -s ours am: 82ca16edfe -s ours am: 79cd6400a1 -s ours am: 039264f309 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23e6ce42c4277609faffdcfc4ecafc21b5925071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:14:03 +00:00
Yuri Lin
0b1866de40 [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-qpr1-dev am: e86aa60071 -s ours am: ab080cd4ed -s ours am: 0488430a2a -s ours am: e55b0eee89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I987f404ee156ed4fbb6eea41c37f9d4b81b0cc21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:13:55 +00:00
Yuri Lin
0da1c0c24e [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: f12f2d461e -s ours am: 2c57dbe998 -s ours am: 23faeff8be -s ours am: 4ff7409501 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibad54ede0a783a0e971d0ccc6fb317eb18483524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:13:47 +00:00
Yuri Lin
9172800934 [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into sc-v2-dev am: 037ec4b4a2 -s ours am: 2509cbd548 -s ours am: 30c52e8d17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff6740a6e5fdf095089c8019f194f70d3260df61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:13:00 +00:00
Yuri Lin
2c7f7b5845 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 36c2974dcb -s ours am: cc3f566015 -s ours am: adf0ed0895 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac29ce447db3d186485dde0c12259e873b58e373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:12:51 +00:00
Yuri Lin
69e99fea5c [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-v2-dev am: 947d313053 -s ours am: 69cb65e1ac -s ours am: 279aaa8b7e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ec904a266729e978380939f9997cdaccdfa317d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:12:22 +00:00
Yuri Lin
f5ee2fe7b0 [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: a8bdabf903 -s ours am: 84766f4716 -s ours am: 4dd93e9ea9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75b9e8b7bab9eee5fb56b358879ddc5cd7755594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:11:49 +00:00
TreeHugger Robot
72f349772e [automerger skipped] Merge "[DO NOT MERGE] Disallow clicks on privacy chip before provisioned" into sc-v2-dev am: 8579c6ee65 -s ours am: 427d692450 -s ours am: 54cd5b77d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c80a641a42ec971557f4b30b0b7dc27d74e686d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:10:36 +00:00
Fabian Kozynski
a960cc2e1d [automerger skipped] [DO NOT MERGE] Disallow clicks on privacy chip before provisioned am: d5038c7253 -s ours am: f088cab69d -s ours am: c545bffbfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6dad2a79dc005b2789a641872f1ac69ac47f38cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:10:28 +00:00
Winson Chung
df64ac77dc Merge "Ensure that only SysUI can override pending intent launch flags" into qt-dev am: c741c6211c am: 41bf4e7cba am: 7adf19f3fa am: 99f48340ac am: 2dc64f374a am: e8f89077cd am: 87b44f8bec am: e288ef9d48 am: 346bf957ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20219552

Change-Id: I3ac97e77170ce562f415d680a0e02d692be9f63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:09:38 +00:00
Iván Budnik
a87b0f935b [automerger skipped] Merge "Enforce MediaButtonReceiver ComponentName belongs to app" into sc-dev am: 047202c00b -s ours am: 1d569978b7 -s ours am: 28f0b43a6e -s ours am: c739ccfa88 -s ours am: 4994aca3a4 -s ours
am skip reason: Merged-In I4aba866a9758366175ea4af0d434729ad98fa48d with SHA-1 863d396f4c is already in history

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

Change-Id: I544734091c394b3c100ded279c0d86e5f7029eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:08:49 +00:00
Iván Budnik
ecd8aed676 resolve merge conflicts of ef33f4c1c8 to tm-dev am: 7647712c61 am: 03785dc3bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20402711

Change-Id: I9e00ed8e8cf505c475fabc9e7c58ccb390121353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:07:46 +00:00
Riddle Hsu
ea48eef91d Merge "Optimize traversal methods from DisplayArea" 2022-11-14 14:06:28 +00:00
Fiona Campbell
5a55d5d74a Merge "Only log internal display interactions." 2022-11-14 13:56:34 +00:00
Chandru S
513f56263b Merge "Update a11y label for unlock icon on lock screen." into tm-qpr-dev am: 2d8ced93d8 am: 830bc2ba6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20424645

Change-Id: Ie4779c10b3afe7ea1f9ef55a07f1ff0a1a08734c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:42:56 +00:00
Yuri Lin
6fbfe4cd05 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 3bba7fb184 am: b203e9f9c2 -s ours am: caf62df2b1 -s ours am: 84ea6eecda -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fa00de70f5dd2b14320602c46bd13c368941fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:41:29 +00:00
Yuri Lin
63e80f94bb [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-dev am: 1585f7c77d -s ours am: f80526cbef -s ours am: 11aed95336 -s ours am: a5283fc065 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa486bf74d397fdb11c651de4165f8bd379dd59a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:41:27 +00:00
Yuri Lin
113483da7d [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7deb6e4565 -s ours am: 6fbb8bd7f2 -s ours am: b22722a0f3 -s ours am: c84ac8093c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id078b23ef46930251e26e328b4366d95efb78ebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:41:25 +00:00
Yuri Lin
fc02d92db2 [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into sc-qpr1-dev am: 15b2a7d593 -s ours am: 0b49769300 -s ours am: d5b2053362 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifff383557e0ea430268d4eb502a7b20225a86199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:40:58 +00:00
Yuri Lin
039264f309 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 8c21e3f5cb -s ours am: 82ca16edfe -s ours am: 79cd6400a1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibfdf50b0151d1b81e17cb525175690c071611380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:40:55 +00:00
Yuri Lin
e55b0eee89 [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-qpr1-dev am: e86aa60071 -s ours am: ab080cd4ed -s ours am: 0488430a2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8641908e229d258fad6ccb16a64791e11786ac0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:40:53 +00:00
Yuri Lin
4ff7409501 [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: f12f2d461e -s ours am: 2c57dbe998 -s ours am: 23faeff8be -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6d3cc3418f34d0c978b2abb3db2d30097655ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:40:50 +00:00
Yuri Lin
30c52e8d17 [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into sc-v2-dev am: 037ec4b4a2 -s ours am: 2509cbd548 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5346b2e750c029490d4c178c1787ac64dc61d238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:40:30 +00:00
Yuri Lin
adf0ed0895 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 36c2974dcb -s ours am: cc3f566015 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica9321a4713d72aa87553f2e9277db882d4b476b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:40:27 +00:00
Yuri Lin
279aaa8b7e [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-v2-dev am: 947d313053 -s ours am: 69cb65e1ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I597645769073bb966ae7103311180b5828c7e332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:40:25 +00:00
Yuri Lin
4dd93e9ea9 [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: a8bdabf903 -s ours am: 84766f4716 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I326aaece9b73cfa56640869c8253048f1f3498b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:40:24 +00:00
TreeHugger Robot
54cd5b77d6 [automerger skipped] Merge "[DO NOT MERGE] Disallow clicks on privacy chip before provisioned" into sc-v2-dev am: 8579c6ee65 -s ours am: 427d692450 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ff24f0aac25993660b25f222ff7b7fcba0f8b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:40:08 +00:00
Fabian Kozynski
c545bffbfb [automerger skipped] [DO NOT MERGE] Disallow clicks on privacy chip before provisioned am: d5038c7253 -s ours am: f088cab69d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I070fd718b268c8ed2d2d2765e70985ed292208d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:40:02 +00:00
Winson Chung
346bf957ab Merge "Ensure that only SysUI can override pending intent launch flags" into qt-dev am: c741c6211c am: 41bf4e7cba am: 7adf19f3fa am: 99f48340ac am: 2dc64f374a am: e8f89077cd am: 87b44f8bec am: e288ef9d48
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20219552

Change-Id: I67ddc366eb3ddab62dc191b259007f1a27de6ee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:39:49 +00:00
TreeHugger Robot
607f995051 Merge "Squash frequency control capability for merged multi-vibrators when missing frequency profile." into tm-qpr-dev am: 8cd94e33fa am: 9dfb0c4f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20441507

Change-Id: Ib29fc028c15fe43f6ee4f77d438527a36754541f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:39:48 +00:00
Iván Budnik
4994aca3a4 [automerger skipped] Merge "Enforce MediaButtonReceiver ComponentName belongs to app" into sc-dev am: 047202c00b -s ours am: 1d569978b7 -s ours am: 28f0b43a6e -s ours am: c739ccfa88 -s ours
am skip reason: Merged-In I4aba866a9758366175ea4af0d434729ad98fa48d with SHA-1 863d396f4c is already in history

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

Change-Id: If74cdc231c48ccf404030be413548757e87a10d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:39:14 +00:00
Iván Budnik
03785dc3bf resolve merge conflicts of ef33f4c1c8 to tm-dev am: 7647712c61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20402711

Change-Id: I0534b89e5187f0c8611b19f9baca8b4cc5db17d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:37:10 +00:00
Chandru S
830bc2ba6a Merge "Update a11y label for unlock icon on lock screen." into tm-qpr-dev am: 2d8ced93d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20424645

Change-Id: I7b62b75b637ec0504c720b880c07e6f9ba4a63f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:07:57 +00:00
TreeHugger Robot
9dfb0c4f3a Merge "Squash frequency control capability for merged multi-vibrators when missing frequency profile." into tm-qpr-dev am: 8cd94e33fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20441507

Change-Id: I44074f4c07e7070d8ff7931b56f8f4cee9b4f611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:05:51 +00:00
Chandru S
2d8ced93d8 Merge "Update a11y label for unlock icon on lock screen." into tm-qpr-dev 2022-11-14 13:00:08 +00:00
Oleg Blinnikov
f3d9ff2276 [automerger skipped] Merge "Fix rounded corners cropping for letterbox" into tm-qpr-dev am: 40adcdd721 am: 949826ae94 -s ours
am skip reason: Merged-In Id1ac9252fbf102e321a89330aefda9ca2624fe66 with SHA-1 7a7c6d387f is already in history

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

Change-Id: I28d358d662b17f40bf118271f576aa653f36a3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 12:39:55 +00:00
TreeHugger Robot
8cd94e33fa Merge "Squash frequency control capability for merged multi-vibrators when missing frequency profile." into tm-qpr-dev 2022-11-14 12:25:16 +00:00
TreeHugger Robot
5b48b2839c Merge "Revert "Extand the long press duration"" 2022-11-14 12:11:28 +00:00
Oleg Blinnikov
949826ae94 Merge "Fix rounded corners cropping for letterbox" into tm-qpr-dev am: 40adcdd721
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20150667

Change-Id: Ia3344c496c60a217e0a5dc1b6c6dd0a6a6a1edd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 12:06:07 +00:00
TreeHugger Robot
92e8a28c74 Merge "Reduce DPAD navigation logspam with killable IME" 2022-11-14 11:54:42 +00:00
Oleg Blinnikov
40adcdd721 Merge "Fix rounded corners cropping for letterbox" into tm-qpr-dev 2022-11-14 11:30:18 +00:00
Santiago Seifert
d7fcc948d6 [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into tm-mainline-prod am: 1f98044c22 -s ours
am skip reason: Merged-In I01bda0f5bf343d73c480ad64b562dd0a2ee46e30 with SHA-1 e1d26ebf1f is already in history

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

Change-Id: I77af06bccc25b9d7e903adab9302181194ea7223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 11:22:50 +00:00
Martynas Petuška
88275cca27 Merge "wipeData/wipeDevice API!" 2022-11-14 11:20:07 +00:00
Chaohui Wang
5552ef58a9 Merge "Set BUILD_TOOLS_VERSION for Spa" 2022-11-14 11:02:45 +00:00
Jigar Thakkar
f38f9e6271 Merge "Add new UserProperty to enable cross profile contact access" 2022-11-14 10:59:37 +00:00
Santiago Seifert
1f98044c22 Merge "Revert "Enforce ComponentName belongs to caller app"" into tm-mainline-prod 2022-11-14 10:48:55 +00:00