Iván Budnik
|
0dedfb7f48
|
[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed18 -s ours am: 9dad574d1a -s ours am: a6fce7e150 -s ours am: e6c24c526e -s ours am: 06d224791c -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959
Change-Id: Ifb1d8f9365acb733b7a016c6a2db598a2d1985e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:19:48 +00:00 |
|
Iván Budnik
|
59352a0608
|
[automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours am: 3261dee3d8 -s ours am: 0983f6341f -s ours am: 5bae12681c -s ours am: b549dc4374 -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773959
Change-Id: I9a0869507fad43d172bf27a96f25c17103b1470f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:19:41 +00:00 |
|
Evan Rosky
|
c40a7822b5
|
Merge "Stabilize overview/quick-switch transitions" into udc-dev am: 294c7e8446
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21498852
Change-Id: I03163d447897b250b4b55dd67d346e69f0ae8207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:19:19 +00:00 |
|
Evan Severson
|
9d2751a822
|
[automerger skipped] Merge "Make sure parallel broadcasts enforce excluded permissions" into sc-dev am: 3f015cbc5e -s ours am: 26d74af6c8 -s ours am: d0b4517df1 -s ours am: 9d9c2a5409 -s ours am: 02b3713d0b -s ours
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529
Change-Id: I3d80100f1cfa7456cb2e03ef9c3fe7ebd0be02b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:18:31 +00:00 |
|
Evan Severson
|
63d087944c
|
[automerger skipped] Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-mainline-prod am: ae83695422 -s ours am: 0fbaf3f75c -s ours am: 71f781827d -s ours am: 06de439e5c -s ours
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341529
Change-Id: Ia2991f2b4ac363236a54032050518c23f481486b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:17:41 +00:00 |
|
Yuri Lin
|
eba3093fcb
|
[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into qt-dev am: 3fe8fdc4dc am: 85d0cb310c -s ours am: 4bc4a7d756 -s ours am: 5725377e5c -s ours am: c73ff23f81 -s ours am: 4d6f934469 -s ours am: 93b2953bd4 -s ours am: 6f52088fe0 -s ours am: b6005b0101 -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 0b262d0ae5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868480
Change-Id: Ifeec0c9cb5baec48a70c4f912d624168d6af7f50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:16:13 +00:00 |
|
Yuri Lin
|
a40edbaaa6
|
[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into rvc-dev am: 06377249c0 -s ours am: b6ae840c5d -s ours am: 697d4897cf -s ours am: 31dea05183 -s ours am: 20d8c3a8b9 -s ours am: f539a8a378 -s ours am: 5ca738e9cf -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 2ceaaebb3c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19867135
Change-Id: Ib21ff13a865eb70eb5b8a8e1ffab668e27356acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:15:34 +00:00 |
|
Yuri Lin
|
3ae76a6e1d
|
[automerger skipped] Fix system zen rules by using owner package name if caller is system am: 0b262d0ae5 -s ours am: cb57bce342 -s ours am: d38cce80f9 -s ours am: 210b6deca8 -s ours am: 6702470ae4 -s ours am: c87222e79c -s ours am: 78eee3101b -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 2ceaaebb3c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19867135
Change-Id: I43e745383085b134180f9a35cf1d963e9c8346d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:15:12 +00:00 |
|
Yuri Lin
|
9bea8a37ef
|
[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into rvc-qpr-dev am: e3434b5548 -s ours am: dcbabe5a88 -s ours am: 56ca07467c -s ours am: 7ba11d90cb -s ours am: e7cf4cc009 -s ours am: d7dd709661 -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19867134
Change-Id: I8eacab78b228449571a62d72309f4babd344888f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:14:21 +00:00 |
|
Yuri Lin
|
4659126737
|
[automerger skipped] Fix system zen rules by using owner package name if caller is system am: 2ceaaebb3c -s ours am: e0a4c485a3 -s ours am: 48cf2b8d83 -s ours am: e44008047e -s ours am: 0d4a893179 -s ours am: a5f3f3664f -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19867134
Change-Id: I2cdea2cae70bc353829ca2de5227ec7a0748baca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:14:01 +00:00 |
|
TreeHugger Robot
|
1853124899
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission for VoiceInteraction" into qt-dev am: cef7f19369 am: 14246ca9b8 -s ours am: 3a946e8c95 -s ours am: 4be854db74 -s ours am: e67265edf2 -s ours am: 4638658c39 -s ours am: 326ceef931 -s ours am: 135ffe4868 -s ours am: 63725f305c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803236
Change-Id: I2b79ca06788ba7b6b2ea7903e8d1b276fd65fad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:13:21 +00:00 |
|
Ivan Chiang
|
e75c046e88
|
[automerger skipped] [RESTRICT AUTOMERGE] Check permission for VoiceInteraction am: e4e77f4570 am: 8862cac366 -s ours am: ee0f678dcf -s ours am: 9e5f614a13 -s ours am: 1cb961704f -s ours am: bf9bdf5fca -s ours am: 804dc8594a -s ours am: 69e0eb277f -s ours am: 7afdc94d12 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803236
Change-Id: Ie42c30d175827f6dc9eb2014f04cf97065e676fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:13:12 +00:00 |
|
TreeHugger Robot
|
9191d19acf
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission for VoiceInteraction" into rvc-dev am: 5f0da27aab am: db0918e39a -s ours am: b442594b71 -s ours am: 96a1d2bf10 -s ours am: e6b8b9881f -s ours am: dba5bb6606 -s ours am: 0c6580ef3e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18708335
Change-Id: I095fb862c694fb8708632964c935ab9230178158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:12:12 +00:00 |
|
Ivan Chiang
|
3d437ee3c8
|
[automerger skipped] [RESTRICT AUTOMERGE] Check permission for VoiceInteraction am: 525690ce16 am: f6ab03e679 -s ours am: 2bc68fb4ad -s ours am: 3f0613c26a -s ours am: cb95673e0a -s ours am: 9ab751f6fc -s ours am: aa5b8a2b86 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18708335
Change-Id: Ieb78731d3acf6fe5c54b8cf62919ce46d5cf2bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 02:12:02 +00:00 |
|
TreeHugger Robot
|
86df604753
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission for VoiceInteraction" into rvc-qpr-dev am: 4d31d49108 -s ours am: b1aba9a8e9 -s ours am: 6c371f6dc1 -s ours am: e67de3f490 -s ours am: c09be3719d -s ours am: 3ccb9e6dbc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803235
Change-Id: Iee81b490928b8836940709f80feb7d0b129854a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:33:13 +00:00 |
|
Ivan Chiang
|
03acf53015
|
[automerger skipped] [RESTRICT AUTOMERGE] Check permission for VoiceInteraction am: 25834066d3 -s ours am: 9265c1a9bc -s ours am: 90f456be06 -s ours am: a22399feff -s ours am: 122580f8a3 -s ours am: dda1c5343c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803235
Change-Id: I7ae54a5292639ad7eb139a32ccbb887b8586cf53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:32:54 +00:00 |
|
Yuri Lin
|
5a254100be
|
[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into qt-dev am: 380ec03dee am: e5fdd7f0de -s ours am: ae6b8569a3 -s ours am: 36de09dab8 -s ours am: 6f0bda9117 -s ours am: 1c05308857 -s ours am: 349cfc899a -s ours am: 2758315f35 -s ours am: 1a72dbccc2 -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 1fcd99f5aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816794
Change-Id: I7fd39f3b7d898d011c453d435837be96c61f3aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:32:10 +00:00 |
|
Yuri Lin
|
ac187f12d7
|
[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into rvc-dev am: 6df0223ee6 -s ours am: 3809613ecd -s ours am: 6ae0f72e44 -s ours am: a2966f173d -s ours am: 69ff110d4a -s ours am: 4fe29f8101 -s ours am: 43dfcbf7d5 -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 5b0c4af9ba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816755
Change-Id: Ib7bfbe9e13648529488902dbf6fa30e9456e4746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:31:39 +00:00 |
|
Yuri Lin
|
5cea640a09
|
[automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 1fcd99f5aa -s ours am: b7b76c0b92 -s ours am: fa763850dd -s ours am: 727863dae4 -s ours am: e7500c553f -s ours am: 7cfff72fd7 -s ours am: 3203977d20 -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 5b0c4af9ba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816755
Change-Id: I5f2d96c4d2959ba2aee046beeb6aae43b8cd8bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:31:30 +00:00 |
|
Yuri Lin
|
bb0bb3e044
|
[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into rvc-qpr-dev am: 0b50f9cd27 -s ours am: c74c781cfd -s ours am: c1a83dd3f9 -s ours am: 0a28e73771 -s ours am: 9e543de6bc -s ours am: 7f8a22fd7b -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 19bc2c3559 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816793
Change-Id: Iaa1089745f3632a83098d2e884d22e41ca3b1886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:30:41 +00:00 |
|
Yuri Lin
|
5060d2283f
|
[automerger skipped] Trim any long string inputs that come in to AutomaticZenRule am: 5b0c4af9ba -s ours am: f98751379a -s ours am: 9e9c2c149b -s ours am: 0ce82a0d20 -s ours am: 419dd63590 -s ours am: 1a989a53af -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 19bc2c3559 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816793
Change-Id: I340528265a516d6364cf6284c2ef6e90067132c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:30:21 +00:00 |
|
Liana Kazanova
|
e47f5141c5
|
Merge "[conflict] [conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8cd2 am: 9f864c4b23 am: ef2a1d60be am: 043b90b360" into sc-dev am: b62eeefe44 am: 2499b96081 am: 14549f9099 am: b0911a091a am: b685194d57
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19874087
Change-Id: Id01ee07d0c88a2b691c031357c56609e90f29e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:28:34 +00:00 |
|
TreeHugger Robot
|
4148080009
|
Merge "Make VZN 1839 use 5G UW icon" into udc-dev am: 0288659f30
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21536168
Change-Id: I9f900a2485054990b65c3277860aa10c57453dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:27:07 +00:00 |
|
Yuri Lin
|
ebd4fa2b98
|
[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into sc-dev am: 74f4246a9f -s ours am: b82c4ea941 -s ours am: 53e03640ee -s ours am: f5cce7dd94 -s ours am: 225603d4b2 -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868479
Change-Id: I781f5898839adf2603d2cc429d91d4f6ae079418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:25:34 +00:00 |
|
Yuri Lin
|
aba9eda875
|
[automerger skipped] Merge changes from topic "presubmit-am-5d70d7e9c9634af1b0b082cbc89e0dad-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: af915107ab -s ours am: 1009c7d3f2 -s ours am: 017aee2824 -s ours am: 9f8f7a95b8 -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 b8c4819ec2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868479
Change-Id: Ief2939ffa464184e6af1e16a3701f784e81ded8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:24:59 +00:00 |
|
Yuri Lin
|
603baff212
|
[automerger skipped] [automerge] Fix system zen rules by using owner package name if caller is system 2p: 78245566a2 am: 429872b0e0 -s ours am: def2025bd8 -s ours am: f795722cfa -s ours am: 2bb72c2e77 -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 b8c4819ec2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868479
Change-Id: I3e5f1cd026c51afc1e1ac05d347e0c92e4391964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:24:41 +00:00 |
|
Yuri Lin
|
1bebc74c4a
|
[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: 416fa055a0 -s ours am: 2a276b65f5 -s ours am: e22fb10ea6 -s ours am: 426d8a262d -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 19bc2c3559 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816496
Change-Id: Iba1a5a74f2f000b84f9f61ec1fa5e290c2a02747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:23:47 +00:00 |
|
Automerger Merge Worker
|
dc25e14ff2
|
Merge "Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: acb4c9b751 am: d19735f042 am: 0f77cab6a8" into udc-dev am: b20c2e6a43
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816496
Change-Id: I1d693d1278fe5d21b1e990a05b94d9399da58fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:23:13 +00:00 |
|
Riley Jones
|
12d02ee87d
|
Merge "Fixing the StrictMode errors in A11yMenu" into udc-dev am: e3e968bb83
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21544345
Change-Id: Ie6df8b77d7820c94adadac24dd785a4a78d20257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:19:51 +00:00 |
|
Automerger Merge Worker
|
6aacd7387b
|
Merge "[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c578 am: b5e74c1c7e -s ours am: 8cfe99d2e5 -s ours am: 167fa8ba83 -s ours" into sc-dev am: 8449f44bcf -s ours am: 3e44a311d5 -s ours am: c78b6a4495 -s ours am: 5962b553d9 -s ours am: 38961ed5b2 -s ours
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d6232 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744482
Change-Id: Ia457d1ee9d0d475563fcc816f5da277d891dd03d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:17:35 +00:00 |
|
Yuri Lin
|
d011f3cd2d
|
[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c578 am: b5e74c1c7e -s ours am: 8cfe99d2e5 -s ours am: 167fa8ba83 -s ours am: 8583d6eac1 -s ours am: 8835849598 -s ours am: fc43787984 -s ours am: 185fe63577 -s ours am: 4c643ab913 -s ours
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 3201baad70 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744482
Change-Id: I19f53e9941d5405708683d4b1ca0088feef2be4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:17:15 +00:00 |
|
Yuri Lin
|
a2eb56fd4a
|
Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-dev am: 269deccf66 am: cc4ac51a4a am: dec8a6fc5b am: 7912b3ad48 am: 3062c7d55c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748653
Change-Id: I9bfb6bc8a9f4ddfcfceb215ea09e09af9f6230d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:16:30 +00:00 |
|
Yuri Lin
|
00933e7ddb
|
Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into sc-mainline-prod am: b47527946c am: 4952fd8b21 am: 90d2b9b7c6 am: 2ef08c0b5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748653
Change-Id: I36c063103527c9aa358edd5a434475bbd0b7b326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:15:49 +00:00 |
|
Yuri Lin
|
62309434ad
|
[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: 3201baad70 -s ours am: 6966525094 -s ours am: a35e748eaf -s ours am: 9bb31521fc -s ours am: 8c4413db49 -s ours am: 55353eefcb -s ours am: 25f0d04d76 -s ours
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 df439a438f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744598
Change-Id: I4f70beb6b1931c4199a2d0a975de4b6b53d255f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:15:15 +00:00 |
|
Yuri Lin
|
86d96d1d5b
|
[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: df439a438f -s ours am: a1bbd7860a -s ours am: 93c1930eb1 -s ours am: fa1cf1f77b -s ours am: 794b159538 -s ours am: 6a4037bad7 -s ours
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744597
Change-Id: Ie90eabdec29c93d82e61651360410c7c16da602e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:14:38 +00:00 |
|
Ganesh Olekar
|
418c1f39c3
|
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-dev am: 391cabb10c am: 4239eb38e7 -s ours am: 2fb421510b -s ours am: a0b994fe0f -s ours am: 005393a7aa -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500370
Change-Id: I4f3f3cf96cf40cc388354db34efd0fc6d21e1b97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:14:03 +00:00 |
|
Ganesh Olekar
|
3ded9f9d30
|
Merge changes from topic "scdevbug" into sc-mainline-prod am: 1309cfa824 am: c88821b71b am: a380b898f2 am: 6a4871b0c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500370
Change-Id: Ibc435051c61bbf483650e91de704dc9e1e6881a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:13:23 +00:00 |
|
TreeHugger Robot
|
e1be135798
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 096b3f466d -s ours am: 07adc3ac7b -s ours am: 77d52445f6 -s ours am: 469e694989 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744945
Change-Id: I362fec1d080b174796433da4e45ac6e20945374b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 01:12:47 +00:00 |
|
TreeHugger Robot
|
36a9c3e65e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 190f79492d -s ours am: 105501ae7b -s ours am: 8ebb625f68 -s ours am: 160f21e86c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19742469
Change-Id: Iea6485c360c64d27ee5574cf33b02c75384247f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:52:09 +00:00 |
|
TreeHugger Robot
|
847fbeebdd
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 79787457a1 -s ours am: 6592a2f307 -s ours am: faa9a693ec -s ours am: 40bd46780d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19742404
Change-Id: Ibe5c5518684d490dd19813cf3f2ca90c3de21348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:51:50 +00:00 |
|
TreeHugger Robot
|
5c824b21ed
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: c5b25ef847 -s ours am: 00f4e53437 -s ours am: 86ec9f7b79 -s ours am: 6efd709049 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19742328
Change-Id: Ic8bbd5f7b0f442de98d9058ac2a5e0b00bdccb8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:51:31 +00:00 |
|
TreeHugger Robot
|
d19fdc0a11
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d2a94ce448 -s ours am: 3e9a16df76 -s ours am: 47c7d67055 -s ours am: 60d79f6c6f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19742324
Change-Id: I684768053c5f7dc90329c67b079b332b526224dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:51:00 +00:00 |
|
Brian Egizi
|
59fdd6de6f
|
[automerger skipped] [manual merge] Import translations. DO NOT MERGE ANYWHERE am: 7921912f19 -s ours am: d21a12beee -s ours am: 181c85f9ff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21548090
Change-Id: Idddabce1ea1da429a1b6f0e1cfdddddf05fecd2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:50:19 +00:00 |
|
Beverly Tai
|
5cd526ca1b
|
Merge "Update KeyguardUpdateMonitorTest" into udc-dev am: 6c89808068
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21549993
Change-Id: I04efd00670e6f341449a8ca30b187f09fc1273c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:50:09 +00:00 |
|
Michael Groover
|
c1be8097e2
|
Merge "Expose BroadcastOptions public constructor" into udc-dev am: e1295fff9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21541692
Change-Id: I1a8f8db056bdfc79d55c485f5235c85d0ec67dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:49:39 +00:00 |
|
TreeHugger Robot
|
786c2845a3
|
Merge "Refactor KeyEvent constructors." into udc-dev am: 2d35bd90f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21549225
Change-Id: I792865649b6fb509e6c12b472a66b5632bd98782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:46:35 +00:00 |
|
Hai Zhang
|
88cbf43802
|
Merge "Fix multi-user handling in PermissionPolicyService." into udc-dev am: f210b1bc34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21555343
Change-Id: I7b0cd2391ac62968bef0bc0126f6333acc15c96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:46:14 +00:00 |
|
Daniel Norman
|
2ffd329a97
|
Merge "Initialize DirectA11yConnection pid in constructor, not static." into udc-dev am: 5a2edd43f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21529705
Change-Id: Ie38b9d504d67b0e9262331167e4dd4073ed1ea49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:45:55 +00:00 |
|
Lyn Han
|
757475a863
|
Merge "Update USER_SET flag when user toggles FSI permission" into udc-dev am: c2a7bf8ba3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21482418
Change-Id: I766322a81dffd397d5c651f98b1f6e6f51e18b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:45:33 +00:00 |
|
Priyanka Advani
|
c16c18b39d
|
Merge "Revert "Turn on customization flags for dogfood"" into udc-dev am: 0effc8910c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21559337
Change-Id: I7bbeff105b4abe3b1c9b94e79e7a6e7450cc5772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:45:09 +00:00 |
|