Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
780,701 Commits 3 Branches 0 Tags
7cd8f5dfc315bbca3f61280b8f43757eaed00cbc
Commit Graph

780701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7cd8f5dfc3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a838cda193 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia74ae53047e8505bfb5bc3620d0aaf698559be96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-21 21:40:24 +00:00
TreeHugger Robot
59ed93442a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5a12e36c74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I057bdd02eb45e1f0605ee3d4ccd2228903c8ad80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-21 21:33:04 +00:00
Bill Yi
c1519cc718 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47da916672 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6101ec09c47467089e1a1ba8d8af24ec4b6c8058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-21 21:32:41 +00:00
TreeHugger Robot
5a12e36c74 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-09-20 21:00:30 +00:00
Treehugger Robot
b5f26196ae Merge "CEC: Implement getSupportedShortAudioDescriptor method." am: b65741930f am: b1f73213b6 am: c8beeff74c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081683

Change-Id: If6d54566facaaff90d223ebc4ab9b11bf8a3eec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 13:20:01 +00:00
Treehugger Robot
c8beeff74c Merge "CEC: Implement getSupportedShortAudioDescriptor method." am: b65741930f am: b1f73213b6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081683

Change-Id: Icbb852a85c0bfcb83890326072569caad623c25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 12:53:27 +00:00
Orion Hodson
53e69c7eb3 Merge "Prefer valueOf() to boxed primitive constructors" am: 773627cfd3 am: 2488ef52b4 am: f43a706e53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216444

Change-Id: I73085165b50ea9bdcc5b15359d899a72d034a251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 12:34:17 +00:00
Lorenzo Colitti
7e87ea0629 Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb561060 am: 1fb227f17f am: 788c6cc563 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200482

Change-Id: I44241f7a8e71846cf2067693006505fc326ec736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 12:33:05 +00:00
Treehugger Robot
3a47e2f6e9 Merge "Remove Python enables identical to global defaults." am: 3fd51ff02a am: a728156a2d am: 1c9e3b6c5a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220474

Change-Id: If0645c30b77f896d2a3d48416e3c2c0601d7e9a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 12:30:30 +00:00
Xinyi Zhou
f4b45a5faa Merge "Add NAMESPACE_NEARBY String" am: 4339e51473 am: 9bd0f75bf4 am: f58897e737 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219630

Change-Id: I18b80b0b59651dde346de51ee8a3e861b63561b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 12:29:05 +00:00
Dorin Drimus
44e565c255 Merge "Use local status for convert profile" am: 7aab6bbe3d am: b9b3f78f04 am: 1e239a8a4d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2218683

Change-Id: Idb06c858e67d00d1fad29ae6029436bf9cc798bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 12:28:23 +00:00
Helen Qin
ddd5d13250 Merge "Set up UX directory and OWNERS for the credentials module." am: d6a9de158b am: 3a7780a6a9 am: cc8e173f70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2215372

Change-Id: Ic3da5fcb452c35e06253b033aea1ad3d3d2df3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 12:27:35 +00:00
Treehugger Robot
3f20176ddf Merge "Keystore: Included KM_TAG_RSA_OAEP_MGF_DIGEST tag" am: eea63d6aa4 am: f42d5e8847 am: 72b1cc3e49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2167462

Change-Id: I165d602263b82f793c0aa01b0d74cd2f9759b88b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 12:12:20 +00:00
Treehugger Robot
b1f73213b6 Merge "CEC: Implement getSupportedShortAudioDescriptor method." am: b65741930f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081683

Change-Id: I839258c29a7e40b0e83fe64f0f8b8162aad27212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 12:11:05 +00:00
Orion Hodson
f43a706e53 Merge "Prefer valueOf() to boxed primitive constructors" am: 773627cfd3 am: 2488ef52b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216444

Change-Id: I353181417b100675b65f0f2eaedf93748f747e83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 12:01:07 +00:00
Lorenzo Colitti
788c6cc563 Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb561060 am: 1fb227f17f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200482

Change-Id: I6baa622d1058a45b4b5fc6c0f8583d6a5216895e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 11:50:25 +00:00
Treehugger Robot
1c9e3b6c5a Merge "Remove Python enables identical to global defaults." am: 3fd51ff02a am: a728156a2d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220474

Change-Id: I69c43dc8f504e1264bb9b123d5eb4a95ef345e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 11:48:41 +00:00
Xinyi Zhou
f58897e737 Merge "Add NAMESPACE_NEARBY String" am: 4339e51473 am: 9bd0f75bf4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219630

Change-Id: I12ab984c90515e3d9f9f10f55bd73dc0ab0dd728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 11:46:09 +00:00
Dorin Drimus
1e239a8a4d Merge "Use local status for convert profile" am: 7aab6bbe3d am: b9b3f78f04 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2218683

Change-Id: I75b0c08cdab964b7bbb38dbfe8a9584383b80c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 11:45:17 +00:00
Helen Qin
cc8e173f70 Merge "Set up UX directory and OWNERS for the credentials module." am: d6a9de158b am: 3a7780a6a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2215372

Change-Id: Ieea7bb10c0ccc959df678862d9c6274b580d1dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 11:44:09 +00:00
Treehugger Robot
72b1cc3e49 Merge "Keystore: Included KM_TAG_RSA_OAEP_MGF_DIGEST tag" am: eea63d6aa4 am: f42d5e8847 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2167462

Change-Id: I06aca2e4bb4b1ee6d24e7ff96e3111cbb884f8b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 11:42:52 +00:00
Treehugger Robot
b65741930f Merge "CEC: Implement getSupportedShortAudioDescriptor method." 2022-09-20 11:37:32 +00:00
Orion Hodson
2488ef52b4 Merge "Prefer valueOf() to boxed primitive constructors" am: 773627cfd3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216444

Change-Id: I71f316027f164dd434602495ba318cd7a4fa8148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 08:08:55 +00:00
Orion Hodson
773627cfd3 Merge "Prefer valueOf() to boxed primitive constructors" 2022-09-20 07:40:59 +00:00
Aravind Angadi
ef3c489eee CEC: Implement getSupportedShortAudioDescriptor method. 
Construct the three byte short audio descriptor for the
audio format codecs when parsing of sadConfig.xml file is failed
in HdmiCecLocalDeviceAudioSystem class.

Bug: 231308055
Test: None

Change-Id: I8177409b9004ff6ff3f539372b636874208575db
 2022-09-20 11:12:13 +05:30
Bill Yi
47da916672 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I54b0d17411a38328ddb935cf4a7b6b32d92141e9
 2022-09-19 20:10:45 -07:00
Lorenzo Colitti
1fb227f17f Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb561060 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200482

Change-Id: I85429b3c686b66cf7ae17e5fc6c4bb18007deffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 02:54:11 +00:00
Lorenzo Colitti
5fbb561060 Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" 2022-09-20 02:32:55 +00:00
Treehugger Robot
a728156a2d Merge "Remove Python enables identical to global defaults." am: 3fd51ff02a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220474

Change-Id: I68fbd97ec1958f1d2966522fc25370a51b323532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 01:16:11 +00:00
Treehugger Robot
3fd51ff02a Merge "Remove Python enables identical to global defaults." 2022-09-20 00:47:01 +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
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
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
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
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
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