Presubmit Automerger Backend
|
89cf5eee80
|
[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f113 am: b60a19142f -s ours am: 78ebce58a8 -s ours am: af49821b99 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: I5b286ba37027e62767f30f1bef233c37c6382459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:34:45 +00:00 |
|
Iván Budnik
|
1a860bc6e3
|
[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -s ours am: e929052d83 -s ours am: 4ecbabc9a3 -s ours am: ef7e395138 -s ours
am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf1993c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19781337
Change-Id: I0199c29eab8f95047ad4a26847298fde01b8e247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:34:30 +00:00 |
|
Iván Budnik
|
2d3d1c97ef
|
[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: 780c568fd4 -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: I05c559ed977b8474dad7c5afd5b69fdc8c710b72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:33:51 +00:00 |
|
Iván Budnik
|
d8dc5c73b4
|
[automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours am: 3261dee3d8 -s ours am: 0983f6341f -s ours am: 65b1791b99 -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: I3b601584f1820fcff4b6bd83ac110e90371fbc90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:33:41 +00:00 |
|
Evan Severson
|
11a7b92ea3
|
[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: 72f470a481 -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: Icc79d8e2dcc4bf610608c4c9472661e611e2212d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:32:40 +00:00 |
|
Evan Severson
|
06a9fed484
|
[automerger skipped] Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-mainline-prod am: ae83695422 -s ours am: 0fbaf3f75c -s ours am: 36d7a42c30 -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: I2aa1fea2bb0c1f884b7b2675a87e56c48ee3a4f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:31:24 +00:00 |
|
Yuri Lin
|
0bf2f95a41
|
[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: 95a008d8ec -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: I33f1844936520459e80c991ac49e31e20970c305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:30:27 +00:00 |
|
Yuri Lin
|
0f811a27b9
|
[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: 45d30e431e -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: I4ad8fbba54baa7bc59d49b382d2a59810c7b9339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:29:49 +00:00 |
|
Yuri Lin
|
bee4d2ac08
|
[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: af13ad2f7e -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: I33535014a305896f83d9350cd56525bd8c0fb4c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:29:43 +00:00 |
|
Yuri Lin
|
9b1996c841
|
[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: efe1bd207b -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: I19bad197cc164d3fc6c000135a21709e8a5d344a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:29:18 +00:00 |
|
Yuri Lin
|
0d01383c15
|
[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: da5637e1ef -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: I857d397e5c64b20448b72792308c79bf7ba07d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:29:11 +00:00 |
|
TreeHugger Robot
|
d8c0d23b82
|
[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: d865316b33 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803236
Change-Id: I91a4c6fb4ca8b8fa48199c98a6468a1669a714b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:28:49 +00:00 |
|
Ivan Chiang
|
b7abb229e7
|
[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: 49c27ddebf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803236
Change-Id: I34435778454bf96e993b657fbdd44873e0e4ddde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:28:44 +00:00 |
|
TreeHugger Robot
|
84e0de7073
|
[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: 959da25a22 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18708335
Change-Id: I5bca571dd164631313f43eca83f0d9322f52e352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:28:09 +00:00 |
|
Ivan Chiang
|
3a8acd0f79
|
[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: 4e7f17da6f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18708335
Change-Id: Ifde11e17b561f4eb036df16537b571175de49686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:28:04 +00:00 |
|
TreeHugger Robot
|
ab615fa107
|
[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: b64c00c806 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803235
Change-Id: I1668e88636c190ce2030e17c9e1f0ba19be1b2df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:27:43 +00:00 |
|
Ivan Chiang
|
32c153157b
|
[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: a6b6de9190 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803235
Change-Id: Ic35bec1e8e0ecb2d62bc7e31e3ef4d6bcd7c7782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:27:37 +00:00 |
|
Yuri Lin
|
7a04b7bcb5
|
[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: 3145e8865b -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: I6efdd8cae715747b1877bd336a901478c537c2cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:26:57 +00:00 |
|
Yuri Lin
|
8667137002
|
[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: f298f4f8a3 -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: I76e87795497cbaf2bf6b2ceb63bc53f1d6995288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:26:36 +00:00 |
|
Yuri Lin
|
0ad698d720
|
[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: 15f26ec732 -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: I7543bc4ab3f3c9492d11bf75eefdbcfd0f91d914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:26:31 +00:00 |
|
Yuri Lin
|
16f4a435cb
|
[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: 72d519c0b8 -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: I8c2e7be9bc0e7361c42146433c01a38926740858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:25:56 +00:00 |
|
Yuri Lin
|
528197f46d
|
[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: 516606d501 -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: I9bb05e295ce6d4dbd3423f53dc69d5d2ce1d9a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:25:46 +00:00 |
|
Winson Chung
|
e2574c8d1d
|
Merge "Skip updating the leash if a task is removed prior to sync completion" into tm-qpr-dev
|
2023-02-23 22:25:00 +00:00 |
|
Winson Chung
|
5502ffbfc2
|
Skip updating the leash if a task is removed prior to sync completion
- Only affects legacy transitions
Fixes: 243848364
Test: atest TaplTestsQuickstep
Change-Id: I9d646573e446833ded399676e0a13d8fa4d47733
|
2023-02-23 22:24:32 +00:00 |
|
Presubmit Automerger Backend
|
af49821b99
|
[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f113 am: b60a19142f -s ours am: 78ebce58a8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: Ie6b81eef5221c15e60161b9e26cfcd961ad521d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:09:15 +00:00 |
|
Liana Kazanova
|
7a0ec6a5cd
|
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: e7430bfc28
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19874087
Change-Id: Ia4816055c10727b856accac92f5ad58b2606b129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:09:05 +00:00 |
|
Iván Budnik
|
ef7e395138
|
[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -s ours am: e929052d83 -s ours am: 4ecbabc9a3 -s ours
am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf1993c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19781337
Change-Id: Ib0261ecd9729770429bb5bd4f09e0a522459e69a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:08:24 +00:00 |
|
Iván Budnik
|
780c568fd4
|
[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 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: I4e4516098ffa104331cc0d87f14d18e58e409bb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:07:36 +00:00 |
|
Iván Budnik
|
65b1791b99
|
[automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours am: 3261dee3d8 -s ours am: 0983f6341f -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: I8c4ac865fb76cac418b415ea8ca2489d6acc2cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:07:31 +00:00 |
|
Yuri Lin
|
b49751c035
|
[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: 70c861eab0 -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: Ide7283e64435944e28549f4c8ba3641244c6a871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:07:22 +00:00 |
|
Evan Severson
|
72f470a481
|
[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 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: Ic81775949941450e35723abfa44f2e9e520fdbc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:07:02 +00:00 |
|
Evan Severson
|
36d7a42c30
|
[automerger skipped] Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-mainline-prod am: ae83695422 -s ours am: 0fbaf3f75c -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: I14ac5d99342baf6dc13f31b2580a4af72bc7f2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:06:45 +00:00 |
|
Yuri Lin
|
c167dc059f
|
[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: a2183a996e -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: I97f85fe3eb0455412b2e3989623eb972620b7aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:06:31 +00:00 |
|
Yuri Lin
|
9ceabb4802
|
[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: 6c793d577f -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: Id8a6701b5fd179c2eb77ec0e91165c519a02ddda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:06:23 +00:00 |
|
Yuri Lin
|
1733e30592
|
[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: ff431e50b3 -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: I709cb232258d982ab37cebfc374351c6b1eef3f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:05:34 +00:00 |
|
Yuri Lin
|
2b1d48a1ca
|
Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: acb4c9b751 am: d19735f042 am: ab74ace3c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816496
Change-Id: I83722534dfb4597fb21375120b6c27fa7a3dae32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:04:11 +00:00 |
|
Automerger Merge Worker
|
90335ee1d3
|
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: 98d86fba3b -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: Ie3be3580a8cd51c472492ecab79bb4deba701d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:01:12 +00:00 |
|
Yuri Lin
|
7f86a68559
|
[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: 26fa609742 -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: I718a8886151084517dc229e75334510a77f729eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:00:49 +00:00 |
|
Yuri Lin
|
8556aa999c
|
Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-dev am: 269deccf66 am: cc4ac51a4a am: dec8a6fc5b am: b3f56893b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748653
Change-Id: Idf8852c3429d401b34e34925062ccb94d3236e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:58:51 +00:00 |
|
Maryam Dehaini
|
f995f08d55
|
Merge "Resizing to invalid bounds causes task to jump to fullscreen" into tm-qpr-dev
|
2023-02-23 21:58:41 +00:00 |
|
Yuri Lin
|
36cbef356b
|
Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into sc-mainline-prod am: b47527946c am: 4952fd8b21 am: 6eb1b76d44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748653
Change-Id: I886eb86f5d661e6e981559b49c405d94a2a338e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:57:17 +00:00 |
|
Yuri Lin
|
007e23d702
|
[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: 9f24fddf81 -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: I0f653369baf6f81754510f40748cdbeb6227c69f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:56:49 +00:00 |
|
Yuri Lin
|
4ac09b1a9b
|
[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: 2501bc0b3f -s ours
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744597
Change-Id: I3dbde52c31de8cd8887a133ce42938c87e9d9ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:56:24 +00:00 |
|
Ganesh Olekar
|
1e89f9831c
|
[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: f985bcbcd4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500370
Change-Id: I774c9241b5f8cf57ef9ef5526d98e7e607768405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:55:30 +00:00 |
|
Presubmit Automerger Backend
|
78ebce58a8
|
[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f113 am: b60a19142f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: Ie60ffe9fffd00149a925b08f4b0373f1119f532b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:54:50 +00:00 |
|
Iván Budnik
|
4ecbabc9a3
|
[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -s ours am: e929052d83 -s ours
am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf1993c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19781337
Change-Id: Iee524392e7a0e22806d14a6408c324f801372717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:53:38 +00:00 |
|
Ganesh Olekar
|
e00632ae4d
|
Merge changes from topic "scdevbug" into sc-mainline-prod am: 1309cfa824 am: c88821b71b am: 5354da6674
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500370
Change-Id: Icc6027a404fe50f4ddcd695669bd4035e3fd6e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:53:18 +00:00 |
|
Iván Budnik
|
a6fce7e150
|
[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed18 -s ours am: 9dad574d1a -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: I9e57cc4d2f34d370ea93ec06ac9c1f4010c7ba9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:52:04 +00:00 |
|
Iván Budnik
|
0983f6341f
|
[automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours am: 3261dee3d8 -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: I71041205e791b83d0c53a567ba8ea4cdf0601531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:51:25 +00:00 |
|
TreeHugger Robot
|
78c1869ef1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 096b3f466d -s ours am: 07adc3ac7b -s ours am: 5b78b5e313 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744945
Change-Id: I18657693564b6bb910ae4516df5696642e7079bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:51:23 +00:00 |
|