Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
799,731 Commits 3 Branches 0 Tags
86c10b434f0d643323ac53b5678ecbc46224654b
Commit Graph

799731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Matt Casey
1e52fddd4b Fix MIME type of non-plain text share intents 
Previously we piped the MIME type to sharesheet, which was incorrect.
Also switch to ClipData.Item's coerceToText() method to avoid NPE when getText() is null.

Also pull all the intent creation code into its own class, test it.

Bug: 243447863
Bug: 236932369
Bug: 222640396

Test: atest IntentCreatorTest
Test: Share text copied from Chrome, note that the full correct app list
      comes up.
Change-Id: Ia438a40423f518275fcd8a09f7de23c511b116fa
 2022-09-19 20:31:21 +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
Automerger Merge Worker
8e821bda9a Merge "[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 79d9a44b03 -s ours" into tm-d1-dev-plus-aosp am: 3bd3f468aa -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/+/19990545

Change-Id: I0d0d9996ca881cc1a2828034a9f05340c83735ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 20:03:22 +00:00
Matt Pietal
f5a47a3dc8 [automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 79d9a44b03 -s ours am: 7809b5bae2 -s ours 
am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history

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

Change-Id: I3f13ece7c7bfa00c7e2ab4bcba1d53fb3c48cf9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 20:03:08 +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
5e78a73c55 [automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 65091e4cac -s ours am: 1516a9c1bc -s ours 
am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history

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

Change-Id: Ia1c5fb48615d8120f862232cc2d19e4445dd8d2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:48:59 +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
Matt Pietal
8f2ea38905 [automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 65091e4cac -s ours am: 3493f307ba -s ours 
am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history

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

Change-Id: I68c270221c7fd27d20f35855f31b809852d3980e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:21:31 +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
Aaron Liu
2581c828e8 Merge "[Bouncer] reset bouncer visibility with doze state." into tm-qpr-dev am: e403afd1c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19971553

Change-Id: I55107d50bb41dc78e1f05a62b0b204e1f3c14a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:21:18 +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
TreeHugger Robot
e1f2824791 Merge "Set elapsedRealtime if HAL doesn't set it" into tm-qpr-dev am: 9421ed72e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970929

Change-Id: I1bb50d40edeb3fe962f8041fdce591fd1b4eed72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:19:30 +00:00
Automerger Merge Worker
3bd3f468aa Merge "[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 79d9a44b03 -s ours" into tm-d1-dev-plus-aosp 2022-09-19 19:02:03 +00:00
Matt Pietal
7809b5bae2 [automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 79d9a44b03 -s ours 
am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history

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

Change-Id: I0f25b600abdd469acc5a93f7270daff825400a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:01:58 +00:00
Matt Pietal
3493f307ba [automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 65091e4cac -s ours 
am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history

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

Change-Id: Id7382f128d5b22538e3fadb72474bd71047c86aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:01:38 +00:00
Matt Pietal
1516a9c1bc [automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 65091e4cac -s ours 
am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history

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

Change-Id: I7218cf1e5411bc3fe10090a1991b91f284d6b9d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:01:32 +00:00