Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
787,611 Commits 3 Branches 0 Tags
21bb03534dd9f5bfbf721f6eeeccb125aaf85c19
Commit Graph

787611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Loureiro
21bb03534d Merge "Pass APK_IN_APEX flag when parsing apk in apexes" into tm-dev am: 938c3d933f am: ca6f893b88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029245

Change-Id: Ief24faaf84808d11d86f31a0e6f89805c71df4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:52:06 +00:00
Automerger Merge Worker
fbd9b23e96 Merge "Merge "Hide UDFPS background on transition Home => AOD" into tm-dev am: a2f6807ac9 am: 0216ab1238" 2022-05-09 21:51:03 +00:00
Beverly Tai
12b344c024 Merge "Hide UDFPS background on transition Home => AOD" into tm-dev am: a2f6807ac9 am: 0216ab1238 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18199688

Change-Id: I97ee0cd19b9bb1c76b686f865c18f772c873fb46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:50:30 +00:00
Sergey Nikolaienkov
98b74f3500 [automerger skipped] Merge "Add simulate-device-(dis)appeared CDM shell commands" into tm-dev am: 8b0ef79199 am: 86dbbc480b am: 7c2bae3be6 -s ours am: e12a865dab -s ours 
am skip reason: Merged-In I5dad0b1859f5292fc0db68ca6ce2114eaa889d4e with SHA-1 0197bcfdc3 is already in history

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

Change-Id: I7262800b741cd72565463bfd67827d31fbc28555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:50:10 +00:00
Kholoud Mohamed
977abedc15 [automerger skipped] Merge "RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments" into tm-dev am: 845fb5095c am: fae3e992c9 am: e5110bf743 am: 7c4d27c5fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic26d545b42f8fa34fec4b65e79be2ce40b5feea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:49:04 +00:00
kholoud mohamed
eb628997e7 [automerger skipped] RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments am: f90b1ac98d am: 3dea601114 am: 96a994a924 am: 3ef61c5e41 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64682d40f33d4ab88a1939523d40666432729416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:48:30 +00:00
Eric Biggers
b1ef25f06a Merge changes from topic "deny-create-user-dirs" am: 350433edc8 am: 8601ad8110 am: 9855b416de am: 4876889b3a am: 9638942620 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2077724

Change-Id: I23aa3fdee7d266be8731802512f561e4a3248e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:47:28 +00:00
Jing Ji
5a9fa98310 Merge "Don't auto move into restricted bucket if there's a recent interaction" into tm-dev am: dc27292ba8 am: c8d9ad7a4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18196542

Change-Id: Idea77d423800f26c9f4ceb2b67f049be0d1482c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:42:49 +00:00
Matt Pietal
8e7c6f0c15 Merge "Update clock top margin" into tm-dev am: ec1e290710 am: 8d11cdb404 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140222

Change-Id: Iaf34eeececed1ecd16ae580291fe9567705cbff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:42:02 +00:00
Sergey Nikolaienkov
e0fcc15688 [automerger skipped] Merge "Add simulate-device-(dis)appeared CDM shell commands" into tm-dev am: 8b0ef79199 am: b62fd52ba6 am: 5d4718610f am: d5b494659a -s ours 
am skip reason: Merged-In I5dad0b1859f5292fc0db68ca6ce2114eaa889d4e with SHA-1 0197bcfdc3 is already in history

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

Change-Id: Ifeced95b4d20b6d7b1de1f85288f8f8de0cb39d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:22:55 +00:00
TreeHugger Robot
6ab8621342 Merge "Fix memory usage issue on WindowTokenClient" into tm-dev am: 20bb840b29 am: 1f29cb9232 am: 995d09ab66 am: c4ef3b6ef7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186210

Change-Id: I9ff1a36aceaceed723f64289b53dd7ee341ff7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:15:15 +00:00
Kholoud Mohamed
2c5e5e554e [automerger skipped] Merge "RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments" into tm-dev am: 845fb5095c am: 36402c123c am: 110c9a7ced am: c1de0ee772 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1160d4e48c9f3552d11612fd9b0d3d58be14a6ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:58:59 +00:00
kholoud mohamed
124bc4d3bb [automerger skipped] RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments am: f90b1ac98d am: ab46aebde1 am: 4eeea834d3 am: affc124b1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie92e7e3d6df45cab1b13be967bdcc95ac36ab8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:58:15 +00:00
Dave Mankoff
9df4694096 Merge "Remove last call to Dep.get from NavigationBarView" 2022-05-09 20:44:42 +00:00
Pedro Loureiro
ca6f893b88 Merge "Pass APK_IN_APEX flag when parsing apk in apexes" into tm-dev am: 938c3d933f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029245

Change-Id: I56a924cc4d07a1f2c55675582daaae17fdad446e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:43:15 +00:00
Beverly Tai
0216ab1238 Merge "Hide UDFPS background on transition Home => AOD" into tm-dev am: a2f6807ac9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18199688

Change-Id: Id7db5fddd0bf105cb7ab5bc1751f870fd0939870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:42:06 +00:00
Jing Ji
c8d9ad7a4e Merge "Don't auto move into restricted bucket if there's a recent interaction" into tm-dev am: dc27292ba8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18196542

Change-Id: Ieccf1adefd1a9f45eb49a565018c5c12cd4197c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:32:35 +00:00
TreeHugger Robot
2b6f1005e5 Merge "Fix memory usage issue on WindowTokenClient" into tm-dev am: 20bb840b29 am: 4d92a4110a am: 462c2d8c06 am: 09d541c765 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186210

Change-Id: I52fd270cdd725523428bb463a8561a8c95b635d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:28:21 +00:00
Matt Pietal
8d11cdb404 Merge "Update clock top margin" into tm-dev am: ec1e290710 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140222

Change-Id: I4e6a82e86d1cb6fc9ec009e4817b99026d8e262a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:18:26 +00:00
Rupesh Bansal
ef24e9c797 Merge "Add documentation for LayoutParams.preferredRefreshRate" into tm-dev am: 336fcab788 am: 77dcc4f870 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17955874

Change-Id: I1732afb2832902d6d4ed54b2934394f880bf1a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:01:00 +00:00
Aaron Liu
5babcdd97f Merge "[User Switcher] Remove callback in onDestroy" into tm-dev am: ebf92a1acb am: 8381fa0ead 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188962

Change-Id: Id6c82b0877491c4848f728527b32d1537071a44d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:51:21 +00:00
Rupesh Bansal
77dcc4f870 Merge "Add documentation for LayoutParams.preferredRefreshRate" into tm-dev am: 336fcab788 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17955874

Change-Id: I9e497c1b6a8ad613aef0e695bb4510696a425ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:50:06 +00:00
Shaowei Shen
0416768023 [automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to volume icon when device is active" into tm-dev am: 67382ffe5c am: 3a5de57e6c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaec34ff4a81f6914cd66565efa45e7a2a86c054e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:46:23 +00:00
shaoweishen
5a4d8c267f [automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to volume icon when device is active am: dc6a2b9129 am: 99ac635269 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a611c1c3a6764d4c40993aa78e2862eb9f8d91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:45:52 +00:00
Aaron Liu
1357c21170 Merge "[Bouncer] Hide status icons in bouncer." into tm-dev am: 9df84388bf am: 75ac98fbcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191040

Change-Id: I326fc797f2e86ae63a860e3ce8338947dc460a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:37:45 +00:00
Shaowei Shen
00406e56fd Merge "[Output Switcher] Adjust device list height" into tm-dev am: bc000778ac am: da59a528bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195524

Change-Id: I05da7fa4f0532077635a3d3978effe803f9a1536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:31:17 +00:00
TreeHugger Robot
2822ed6006 [automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable" into tm-dev am: 4fccafd334 am: c65b32e844 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a372b01e207ae9dbddb85d88c9109a8d63f0aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:27:47 +00:00
shaoweishen
040906cf14 [automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable am: ec0d7f51e5 am: c2d76add11 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4daa402a1fc456513cf9217c9750e907122ec9ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:27:27 +00:00
Aaron Liu
8381fa0ead Merge "[User Switcher] Remove callback in onDestroy" into tm-dev am: ebf92a1acb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188962

Change-Id: I433e6eab3afa0d7e6792c7107e377f9972cd93e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:27:23 +00:00
Shaowei Shen
3a5de57e6c Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to volume icon when device is active" into tm-dev am: 67382ffe5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186207

Change-Id: I60895a1271806a39319035eecc26679247df5e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:25:42 +00:00
shaoweishen
99ac635269 DO NOT MERGE: Downbranch merge conflict [Output Switcher] set icon to volume icon when device is active am: dc6a2b9129 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186207

Change-Id: Iac24fd9862f65bc9b8fb702691b70584814e7274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:25:33 +00:00
Kiwon Park
5706721883 Merge "Populate carrier id in anomaly reports." into tm-dev am: 7742f48683 am: 57c2db457f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179542

Change-Id: I32e50b822f0e2090a9655b891348260d974c4ec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:24:42 +00:00
Haoyu Zhang
70e963753a Merge "Scribe: Introduce HandwritingSlop" 2022-05-09 19:15:44 +00:00
Julia Reynolds
6a2cd76626 Merge "added call notif exemption to PostNotificationRunnable and enhanced relevant tests Test: NotificationManagerServiceTest Fixes: 227456870" into tm-dev am: 8626041c4c am: c8c180fe99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169687

Change-Id: I577f4d2506bef06b83caad845d3dae7056dc3576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:13:26 +00:00
Aaron Liu
75ac98fbcb Merge "[Bouncer] Hide status icons in bouncer." into tm-dev am: 9df84388bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191040

Change-Id: Iefde6a287f53c87359f25641a69f2151cb08c002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:05:10 +00:00
Caitlin Cassidy
ab33869e81 Merge "[Media] Update recommendation a11y content description based on whether guts is open or not." into tm-dev am: 2114ab9ea0 am: ef1a21c2c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18199363

Change-Id: If2f4be8c7e7fd3b9efef205f4781892fdfcd126d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:04:15 +00:00
Caitlin Cassidy
8557700354 Merge "[Media] Update player's a11y content description based on whether guts is open or not." into tm-dev am: 3d32cfd3b0 am: 117920358d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188887

Change-Id: I5e542fec431a13b54b04715a247768f43c887b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:00:53 +00:00
TreeHugger Robot
0df852365b Merge "Filter unsuported native audio formats in getDirectProfilesForAttributes" into tm-dev am: a3f6dae96f am: daa1c402cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188203

Change-Id: I8059708637141e5ee30a1af91d5ef46e9f8b4c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:49:10 +00:00
Shaowei Shen
da59a528bd Merge "[Output Switcher] Adjust device list height" into tm-dev am: bc000778ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195524

Change-Id: Ifa6145f6e962f3ff61bc04199271c24d98f2f5ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:47:29 +00:00
Sergey Nikolaienkov
e12a865dab [automerger skipped] Merge "Add simulate-device-(dis)appeared CDM shell commands" into tm-dev am: 8b0ef79199 am: 86dbbc480b am: 7c2bae3be6 -s ours 
am skip reason: Merged-In I5dad0b1859f5292fc0db68ca6ce2114eaa889d4e with SHA-1 0197bcfdc3 is already in history

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

Change-Id: Id3fdcd27d0ddf4078f01c4c86706f875f94c517a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:34:19 +00:00
Kholoud Mohamed
7c4d27c5fd Merge "RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments" into tm-dev am: 845fb5095c am: fae3e992c9 am: e5110bf743 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164349

Change-Id: Ifbf46b49cfb5a0f247155032eba543b834f2eb1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:33:14 +00:00
kholoud mohamed
3ef61c5e41 RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments am: f90b1ac98d am: 3dea601114 am: 96a994a924 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164349

Change-Id: Iae9a2bb04e3d89ba50fbfad21452899a0829610e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:33:03 +00:00
Tiger Huang
a86bfea124 Merge "Don't clip background drawable if navigation color view is not opaque" into tm-dev am: b8ab50b68b am: 17bca21f03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195528

Change-Id: I7472dcbd4e53a8510e9447b60ea9636f04910ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:32:01 +00:00
TreeHugger Robot
c65b32e844 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable" into tm-dev am: 4fccafd334 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179572

Change-Id: I089b6afa36bdf842b056c223fd66521913779919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:24:53 +00:00
shaoweishen
c2d76add11 DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable am: ec0d7f51e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179572

Change-Id: Idf85ca0b8c8e7dae7810a42305a8fbe822664569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:24:45 +00:00
Eric Biggers
9638942620 Merge changes from topic "deny-create-user-dirs" am: 350433edc8 am: 8601ad8110 am: 9855b416de am: 4876889b3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2077724

Change-Id: Idc537b578f59d90744492bdfc0766bc248a1c61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:17:52 +00:00
Sergey Nikolaienkov
d5b494659a Merge "Add simulate-device-(dis)appeared CDM shell commands" into tm-dev am: 8b0ef79199 am: b62fd52ba6 am: 5d4718610f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907952

Change-Id: Ib97f60295cb45ef8096988ce7aa78d73831daee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:14:15 +00:00
Eran Messeri
7f543f5008 Merge "Keystore: Support Ed25519 keys" into tm-dev am: 22c0a86854 am: 2a1f3ae9f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164945

Change-Id: Ie5ff81b0f20c9551b4a9919e79f81fd571689a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:13:25 +00:00
Kiwon Park
57c2db457f Merge "Populate carrier id in anomaly reports." into tm-dev am: 7742f48683 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179542

Change-Id: Ied9258868b970c7dd4993166a874a231f1d8b531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:09:55 +00:00
Rubin Xu
9c5a573cbb Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev am: 9c9916e4d9 am: 7a6900a0f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18197412

Change-Id: I5a96bafd14fef807272b27a7e56be3b1849d852f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:07:25 +00:00