Commit Graph

661056 Commits

Author SHA1 Message Date
Yuri Lin
8d431561be [automerger skipped] Limit lengths of fields in Condition to a max length. am: 14ceb8a5e7 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 73ad3844ac is already in history

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

Change-Id: Ia25229bfc5b236edaf6894518f5771dae55dcbb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:12:09 +00:00
Yuri Lin
64a78c7a03 Merge "Limit lengths of fields in Condition to a max length." into sc-v2-dev 2022-09-22 15:19:21 +00:00
Songchun Fan
01a79b5ded [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history

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

Change-Id: I82e8ebcee89efe9822ffaf608050e46e4dde85cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 20:46:02 +00:00
Daniel Norman
70f81ff108 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: I94dd2597a8504959f47822a101abe2aa514cd979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 20:45:38 +00:00
TreeHugger Robot
1e7904ddd3 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5bb50fc570c353100f4cf54636875a8defddfd23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 20:44:42 +00:00
Matt Pietal
7c4da0ebf1 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib44b94840757544bd01a73eed6707f7707e6d895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 20:44:27 +00:00
Songchun Fan
d05066f4f7 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history

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

Change-Id: I6d59556e3ee068d14db96ab3154eac5bd1f9ba9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 20:19:02 +00:00
Daniel Norman
cf886522f8 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: Ie075e1041f0e417151cbf812a9b3cb1e03f92ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 20:18:42 +00:00
TreeHugger Robot
605261cc55 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e480083cb68d0b77deac3231d96586b8ad29115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 20:18:17 +00:00
Matt Pietal
e855f9c3b3 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic54f6aa3bc3fa724a21b53628a8c9ba88c622a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 20:17:51 +00:00
Songchun Fan
151d75d3e8 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history

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

Change-Id: I2054a77b1a5c7dbf4260bcf73c222e5a4a4f027b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 19:51:16 +00:00
Daniel Norman
18628f192f Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: I7c652c1b5920bd5a226ec4f987f4d38dbbc60f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 19:50:57 +00:00
TreeHugger Robot
97f625773a [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb1042bd57bb1d0f8d8a4a4d0eaaea412e75a5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 19:50:30 +00:00
Matt Pietal
9b928f8140 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f682aaf487e0f082d4b8dfe6159305b84360a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 19:48:52 +00:00
Songchun Fan
526af0d1b1 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history

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

Change-Id: I7e3dcae19c8112d932490408fbab4eb36045d5e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 19:21:30 +00:00
Daniel Norman
73089d0c3a Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: I9f9dca5eccac9bc82357e1322b3d3534a86e6ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 19:21:10 +00:00
TreeHugger Robot
b7075acb14 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iec721bc5e1d9fbb52634ba16f4d055e253e61f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 19:20:16 +00:00
Matt Pietal
898d578fa1 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0010ea681d0f41e96d0143678e07d5727b4aed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 19:19:43 +00:00
Songchun Fan
478c97e58c [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history

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

Change-Id: Id059621a771490861b3fd4fa491a6dd338e14b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 18:43:49 +00:00
Daniel Norman
10c659e317 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: I7e0febed51091e07af6be4157d081c837a719589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 18:43:22 +00:00
TreeHugger Robot
5ddcc96b01 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08835ffbb0ab13ba76c47bfe0e2d1d3d7a5788ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 18:42:38 +00:00
Matt Pietal
d17cc27210 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie62c1837d7eb8bdb25c51ec2d797bcda4b958ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 18:41:36 +00:00
Songchun Fan
ae7a1df57d Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572

Change-Id: Ic0c235c82f13e4e8f09b35bb9f30134cfcf8617e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 18:19:25 +00:00
Daniel Norman
7588fa6866 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: Ia708dba5893575578ae7a383dd823a3726b5aab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 18:18:04 +00:00
TreeHugger Robot
f3c6684b16 Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859

Change-Id: I6ea11a78ee30c911dee0fe1e71b1bfb422751951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 18:17:30 +00:00
Matt Pietal
02b525316e [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859

Change-Id: Ie85c312ad47c5be276010f0a96d64e058be2fbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19 13:46:09 +00:00
Songchun Fan
9a382decde [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-dev am: 74592430e2 -s ours am: 98ba0a3f7a -s ours am: 0511109afb -s ours am: 9d000dcf5f -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: I20a635b2ef3d041b04e913ad0a6094ff88759edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:53:34 +00:00
Songchun Fan
b6fce8a47a [automerger skipped] [pm] forbid deletion of protected packages am: fcdc62081c -s ours am: 1827bc2be5 -s ours am: 3eac291ad0 -s ours am: 08d869134c -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: I1a425da4cf125257da9a9567ae2ded99e80cc375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:53:31 +00:00
Songchun Fan
5dad605132 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-qpr-dev am: 61ec81ae9b -s ours am: 467fe36031 -s ours am: 4c43a3dd22 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history

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

Change-Id: I4dbef3717b4d34fa4c4878e0ee3369db7afb7ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:53:21 +00:00
Songchun Fan
522f04b9a7 [automerger skipped] [pm] forbid deletion of protected packages am: 538654167a -s ours am: b4f0e16953 -s ours am: 34ea3b2cf1 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history

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

Change-Id: Idfd7dea8edc6b1e5b51beaabe746886ea8ffe256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:53:17 +00:00
Songchun Fan
61e5224009 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-dev am: b2abf2632c -s ours am: 74663b3683 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 2d6eae165b is already in history

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

Change-Id: I1334b4671ffd29e63b6ff11f38ee6f2a68929ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:52:55 +00:00
Songchun Fan
798d7a57ac [automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-qpr1-dev am: 04d4edbc35 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history

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

Change-Id: Idb1c7d287b515e6aee4bdabe601d20dd1e8193f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:52:45 +00:00
Songchun Fan
f88c130108 [automerger skipped] [pm] forbid deletion of protected packages am: 2d6eae165b -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history

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

Change-Id: I49ac7d5579ddc96bee4f3be9ed61144957542daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:52:33 +00:00
Songchun Fan
9d000dcf5f [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-dev am: 74592430e2 -s ours am: 98ba0a3f7a -s ours am: 0511109afb -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: I647ca1616a27bdb00e4085feffc24f1e391fb884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:52:03 +00:00
Songchun Fan
08d869134c [automerger skipped] [pm] forbid deletion of protected packages am: fcdc62081c -s ours am: 1827bc2be5 -s ours am: 3eac291ad0 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: I4d21e8b1194e67c04e7b376d780546e89c97df3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:51:51 +00:00
Songchun Fan
0d9aef812b [automerger skipped] Merge changes from topic "presubmit-am-86d37df06f3b4cba87f03386fed73973" into sc-qpr1-dev am: 870c0fe4f9 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 cbda45eb95 is already in history

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

Change-Id: Ibc2561699b36c99b9fcf68276844a2f9e9cdb12c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:51:48 +00:00
Songchun Fan
4c43a3dd22 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-qpr-dev am: 61ec81ae9b -s ours am: 467fe36031 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history

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

Change-Id: Iff1060f06f578e587f9bb551582fb67b825544fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:51:43 +00:00
Songchun Fan
34ea3b2cf1 [automerger skipped] [pm] forbid deletion of protected packages am: 538654167a -s ours am: b4f0e16953 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history

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

Change-Id: I97d65bff99ab38d8c47336862be2e05c63f274ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:51:41 +00:00
Songchun Fan
2286c37de7 [automerger skipped] [automerge] [pm] forbid deletion of protected packages 2p: dba7ceb57e am: 989782a0ae -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 cbda45eb95 is already in history

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

Change-Id: I14e9c1c0cba1c75fff929bd10e829f3aab8977ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:51:36 +00:00
Songchun Fan
74663b3683 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-dev am: b2abf2632c -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 2d6eae165b is already in history

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

Change-Id: I704d29a70180c14c745a41f867742d1e689a2434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:51:26 +00:00
Songchun Fan
0511109afb [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-dev am: 74592430e2 -s ours am: 98ba0a3f7a -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: I4eb3103f621f6c9f151db80f31c971861b8ec888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:50:38 +00:00
Songchun Fan
3eac291ad0 [automerger skipped] [pm] forbid deletion of protected packages am: fcdc62081c -s ours am: 1827bc2be5 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: I6fccc5324ad0ff34bd16022690bf736fd6df4568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:50:31 +00:00
Songchun Fan
467fe36031 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-qpr-dev am: 61ec81ae9b -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history

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

Change-Id: I795b9a22bb64f6d924fd14c6945b7b7c25cc5b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:50:16 +00:00
Songchun Fan
b4f0e16953 [automerger skipped] [pm] forbid deletion of protected packages am: 538654167a -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history

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

Change-Id: I45d747a757e235d29ba1a331fce39704b086b2f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:50:01 +00:00
Songchun Fan
98ba0a3f7a [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-dev am: 74592430e2 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: I644f3df5600dfc08c7dfd9e8ae306594b1e786e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:48:44 +00:00
Songchun Fan
1827bc2be5 [automerger skipped] [pm] forbid deletion of protected packages am: fcdc62081c -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: Ibfd47d9145701da8f082935c8e9cb963c7c0ec67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:48:28 +00:00
Songchun Fan
74592430e2 Merge "[pm] forbid deletion of protected packages" into rvc-dev 2022-09-15 22:17:49 +00:00
Songchun Fan
61ec81ae9b Merge "[pm] forbid deletion of protected packages" into rvc-qpr-dev 2022-09-15 22:17:38 +00:00
Songchun Fan
04d4edbc35 Merge "[pm] forbid deletion of protected packages" into sc-qpr1-dev 2022-09-15 22:17:28 +00:00
Songchun Fan
870c0fe4f9 Merge changes from topic "presubmit-am-86d37df06f3b4cba87f03386fed73973" into sc-qpr1-dev
* changes:
  [automerge] [pm] forbid deletion of protected packages 2p: dba7ceb57e
  [pm] forbid deletion of protected packages
2022-09-15 22:17:17 +00:00