Ilya Matyukhin
|
b5ce442cd4
|
Merge "Refactor UDFPS display logic and remove illumination" into tm-qpr-dev am: 1ecaa4d68e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949884
Change-Id: Ib162b02b868f3befdf8336295c2535ecfeec0ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-20 00:22:06 +00:00 |
|
Songchun Fan
|
d4f95001c7
|
[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: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 3f6eaacb35 -s ours am: ae5b80ab72 -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: Ie5468756000521668927cb76b9ca70621ab40f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:55:35 +00:00 |
|
Ilya Matyukhin
|
1ecaa4d68e
|
Merge "Refactor UDFPS display logic and remove illumination" into tm-qpr-dev
|
2022-09-19 23:50:27 +00:00 |
|
Automerger Merge Worker
|
b5a0ee46d3
|
Merge "[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: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 18e656dc3c -s ours" into tm-d1-dev-plus-aosp am: eacb009bf0 -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: If557efa911fa1cba8a07a467347f0e117a52feb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:42:13 +00:00 |
|
Songchun Fan
|
4d3c16636d
|
[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: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 18e656dc3c -s ours am: f016b1a511 -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: I41d67101d7a9105d2ff3345ff6605425805c5e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:41:49 +00:00 |
|
Daniel Norman
|
2df7222e32
|
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: d5d9652c4e am: d69adc8368
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: I2ddf72732906d200ec5da39c208f8c434680fdd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:28:15 +00:00 |
|
Daniel Norman
|
2ca66e7d46
|
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: 0ac6337d21 am: e5b113cf3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: Ide3a596738a48454b5bf5a08ebbb85e4e54b1f23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:19:29 +00:00 |
|
TreeHugger Robot
|
461d2efa07
|
[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: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: 10c40702d8 -s ours am: 8592e712e5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: I174c9bdb4c1e0b2a28a9450d36e976ad7f20f0be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:18:31 +00:00 |
|
Automerger Merge Worker
|
86226ec6ce
|
Merge "[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: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: df8c08f7e9 -s ours" into tm-d1-dev-plus-aosp am: bf54253f59 -s ours
am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 3d89cc5df6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: Iea56740c97f70f1e05348615d47e8b75189eb896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:18:02 +00:00 |
|
TreeHugger Robot
|
000269513c
|
[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: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: df8c08f7e9 -s ours am: dc87896a7f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: I88488194aced87687cc498ff340602f0002613bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:17:31 +00:00 |
|
Automerger Merge Worker
|
b5c3c9085a
|
Merge "[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: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours" into tm-d1-dev-plus-aosp am: bd74af9134
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: I3a847e32a2758d0080c5d418fd26ba511f5e04a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:15:39 +00:00 |
|
Matt Pietal
|
86c10b434f
|
[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: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours am: e9fb70d0df -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: Icf387b94ab9d3c3db55bc05220a31b15798ddebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:15:10 +00:00 |
|
Matt Pietal
|
796c219f20
|
[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: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: 769b05b529 -s ours am: 9f2a677234 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: If2e52418b984e66cb42765f58e035753d9615cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 23:14:28 +00:00 |
|
Songchun Fan
|
4e039434b0
|
[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: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 3f6eaacb35 -s ours am: 43ae247466 -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: Ia580360cd5463d264c35c77312cc647671b44d6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:48:25 +00:00 |
|
Daniel Norman
|
d4c1132482
|
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: d5d9652c4e am: ea127ffb59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: I9705924e02c5945f1df3cba0e7f8845601298281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:47:49 +00:00 |
|
TreeHugger Robot
|
cc69aa6f39
|
[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: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: 10c40702d8 -s ours am: 86b114ee53 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: Ief46790f3280382f842dc62fdb5b2b3c7e6dd105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:46:53 +00:00 |
|
Matt Pietal
|
b3f01e3d3e
|
[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: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours am: 78a3712266 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: I6cc86408e5f7001b535e6f7dcd1f01d916a3977d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:46:12 +00:00 |
|
Songchun Fan
|
ae5b80ab72
|
[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: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 3f6eaacb35 -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: I74daaf339b33d8309c9fb56dfc5ab1656572899e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:09:13 +00:00 |
|
Automerger Merge Worker
|
eacb009bf0
|
Merge "[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: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 18e656dc3c -s ours" into tm-d1-dev-plus-aosp
|
2022-09-19 22:09:06 +00:00 |
|
Songchun Fan
|
43ae247466
|
[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: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 3f6eaacb35 -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: Ib1141719772ffd91c12d3e3f3bf20c1b3a41a760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:09:03 +00:00 |
|
Songchun Fan
|
f016b1a511
|
[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: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 18e656dc3c -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: I4751fa2a75982a2f9906d2a6cbeff016fda2dca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:09:03 +00:00 |
|
Daniel Norman
|
d69adc8368
|
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: d5d9652c4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: Ie97b0001d44195ba02130e3b65874fee425f5dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:08:50 +00:00 |
|
Daniel Norman
|
ea127ffb59
|
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: d5d9652c4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: I944e505d87b6f1ef2358fedd607935197bbbcc68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:08:45 +00:00 |
|
Daniel Norman
|
e5b113cf3b
|
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: 0ac6337d21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: Ieaa0c43f936875ec0a98cc6350a1f68cfec60525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:08:32 +00:00 |
|
TreeHugger Robot
|
8592e712e5
|
[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: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: 10c40702d8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: I3c9e9d1deca2fa48adcd3b9e7747a8dda58c4a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:08:11 +00:00 |
|
Automerger Merge Worker
|
bf54253f59
|
Merge "[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: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: df8c08f7e9 -s ours" into tm-d1-dev-plus-aosp
|
2022-09-19 22:08:07 +00:00 |
|
TreeHugger Robot
|
86b114ee53
|
[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: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: 10c40702d8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: I76967e68be39dab20bad92c12173029ffa799b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:08:02 +00:00 |
|
TreeHugger Robot
|
dc87896a7f
|
[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: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: df8c08f7e9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: Ia439cc522aca782582186a50eee9afa5791b665f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:07:55 +00:00 |
|
Automerger Merge Worker
|
bd74af9134
|
Merge "[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: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours" into tm-d1-dev-plus-aosp
|
2022-09-19 22:07:53 +00:00 |
|
Matt Pietal
|
9f2a677234
|
[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: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: 769b05b529 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: I7ca1aca72e1a721aca2d36598f477d2143cca0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:07:38 +00:00 |
|
Matt Pietal
|
e9fb70d0df
|
[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: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: I2bb71e33723878aee4cb453a5d63e79bec401d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:07:35 +00:00 |
|
Matt Pietal
|
78a3712266
|
[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: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: Ie443d4880bd4489352b65b277de0c25cdb1bc18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 22:07:09 +00:00 |
|
Matt Casey
|
24e0f52486
|
Merge "Fix MIME type of non-plain text share intents" into tm-qpr-dev am: 6118cfd13f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19939978
Change-Id: I23125d81e4239c24129fc20607c9894c4e456328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:50:28 +00:00 |
|
Songchun Fan
|
3f6eaacb35
|
[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: 01a79b5ded -s ours am: 0d99f58638 -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: Ic703f6ed01abc54ff3de8cab36a11d6f98997846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:40:00 +00:00 |
|
Daniel Norman
|
d5d9652c4e
|
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: Idddebc27df2994bab6b8ea14ddff2dacadd6d7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:39:41 +00:00 |
|
TreeHugger Robot
|
10c40702d8
|
[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: 1e7904ddd3 -s ours am: e8b730b552 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: I88a54a800b671af025c98b14b9016f0b95d0af55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:39:15 +00:00 |
|
Songchun Fan
|
18e656dc3c
|
[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: 01a79b5ded -s ours am: 0d99f58638 -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: Ib811901da06738ea54fb1fb46de482b81bb5d800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:39:00 +00:00 |
|
Matt Pietal
|
cf19e19498
|
[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: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: Idee945414daa7ab0de397e6af369c8775801a9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:38:51 +00:00 |
|
Daniel Norman
|
0ac6337d21
|
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: Ia2dd5dda431493505e07438238fa6b5490d9632e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:38:20 +00:00 |
|
TreeHugger Robot
|
df8c08f7e9
|
[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: 1e7904ddd3 -s ours am: e8b730b552 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: I7a1f4ebdf3ee786f0e71f3e3c63ba225a1fbf46c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:36:46 +00:00 |
|
Matt Pietal
|
769b05b529
|
[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: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: I2013fea53109745eb762b77d0d515b215a6dc853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:36:12 +00:00 |
|
Matt Casey
|
6118cfd13f
|
Merge "Fix MIME type of non-plain text share intents" into tm-qpr-dev
|
2022-09-19 21:22:48 +00:00 |
|
Songchun Fan
|
0d99f58638
|
[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: 01a79b5ded -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: I5acff2b7bb1fadc2e3328086945d16dedcb4aa73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:11:06 +00:00 |
|
Daniel Norman
|
ef85e63542
|
Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423
Change-Id: Idd1ba2a33d452de717742cd3bc068af775b7baa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:10:25 +00:00 |
|
TreeHugger Robot
|
e8b730b552
|
[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: 1e7904ddd3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: I835fc8d404daca757e53c10081190109ede96fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:09:22 +00:00 |
|
Matt Pietal
|
aebe4548c2
|
[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: 7c4da0ebf1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: I74a450cd414480e91bd960065f4059690c61d335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-19 21:08:43 +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 |
|