Commit Graph

645426 Commits

Author SHA1 Message Date
TreeHugger Robot
9cc367d136 Merge "Fix IME icon flicker when switching apps" into sc-dev am: 9e9caac63e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14779650

Change-Id: Ie2e50fbb4b32cda4250be4c5145b626d4cacbbc5
2021-06-04 05:36:46 +00:00
TreeHugger Robot
9e9caac63e Merge "Fix IME icon flicker when switching apps" into sc-dev 2021-06-04 03:44:13 +00:00
Sarah Chin
0d6da8d903 [automerger skipped] Merge "Remove checks for system_process in TelephonyManager" am: 7576e161f1 am: c32aa3cc70 -s ours
am skip reason: Merged-In Ia15c8183212bc67e74b45fc119b5ef9d4c295c94 with SHA-1 eecdf254e9 is already in history

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

Change-Id: I0aa7d031f34bba6b3c06197499ba80bc8acc25f4
2021-06-04 02:56:16 +00:00
Sarah Chin
b194ee573d [automerger skipped] Merge "DCT set up default before enterprise APN" am: 6428a56e09 am: c4c1cf376e -s ours
am skip reason: Merged-In Ib2f9594933d00307276f4538714a5354d36baf09 with SHA-1 d30c853ac9 is already in history

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

Change-Id: Ie4a8dc8ee5f1842219c685a6d188d6431253ecb4
2021-06-04 02:55:57 +00:00
Sarah Chin
628e6c29a1 [automerger skipped] Merge "setCdmaSubscription/RoamingMode returns when not CDMA" am: fe3320f5a3 am: b6cd808fb3 -s ours
am skip reason: Merged-In I36d69f4bf337ef9c102327bfe87752c56847af87 with SHA-1 0762c16765 is already in history

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

Change-Id: Iafcbae1334af7878ac7f2cba2207e225f8170213
2021-06-04 02:55:32 +00:00
Sarah Chin
c32aa3cc70 Merge "Remove checks for system_process in TelephonyManager" am: 7576e161f1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727133

Change-Id: Ie51c7c734b5f66b69defda91d4ec719e8cec06ef
2021-06-04 02:49:31 +00:00
Sarah Chin
c4c1cf376e Merge "DCT set up default before enterprise APN" am: 6428a56e09
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727412

Change-Id: Ic4694f4818884a95a2372c227be1e8c223f4c353
2021-06-04 02:38:38 +00:00
Sarah Chin
b6cd808fb3 Merge "setCdmaSubscription/RoamingMode returns when not CDMA" am: fe3320f5a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727411

Change-Id: Ia2f8345f90884966939a5236693d5978c609656a
2021-06-04 02:33:45 +00:00
Sarah Chin
7576e161f1 Merge "Remove checks for system_process in TelephonyManager" 2021-06-04 02:11:17 +00:00
Sarah Chin
6428a56e09 Merge "DCT set up default before enterprise APN" 2021-06-04 02:10:29 +00:00
Sarah Chin
fe3320f5a3 Merge "setCdmaSubscription/RoamingMode returns when not CDMA" 2021-06-04 02:10:19 +00:00
Sarah Chin
4a3db57ba5 Remove checks for system_process in TelephonyManager
Instead of throwing exceptions, return the default null/empty/void
behavior.

Test: atest TelephonyManagerTest
Fix: 175881713
Change-Id: Ia15c8183212bc67e74b45fc119b5ef9d4c295c94
Merged-In: Ia15c8183212bc67e74b45fc119b5ef9d4c295c94
2021-06-03 17:56:53 -07:00
Joe Bolinger
9c613a484d Merge "Fix feedback and animations for face to fingerprint fallback authentication." into sc-dev am: 896ac3e18f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14823790

Change-Id: Ia43474de4d06c8809543f51d36c7198e445e0d3c
2021-06-04 00:17:25 +00:00
Lucas Dupin
6950c1f351 Merge "Expanding notification scrim to the edge of the screen" into sc-dev am: 3989babf55
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14807580

Change-Id: I7a792a69c77bb9e6af5c8aab802cb9466f8dcffc
2021-06-04 00:17:09 +00:00
Lucas Dupin
74d1b5f9d1 Merge "Dim wallpaper by setting wallpaper layer transparency." into sc-dev am: 76fda9db9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486205

Change-Id: Ida54877cd357d61876abeac7c1d045df60dce17f
2021-06-04 00:16:54 +00:00
Sarah Chin
92b8e55acf DCT set up default before enterprise APN
Higher priority goes first in mPrioritySortedApnContexts, so change
default priority to be higher than enterprise.

Test: atest DcTrackerTest
Bug: 183738520
Change-Id: Ib2f9594933d00307276f4538714a5354d36baf09
Merged-In: Ib2f9594933d00307276f4538714a5354d36baf09
2021-06-03 17:15:29 -07:00
Joe Bolinger
896ac3e18f Merge "Fix feedback and animations for face to fingerprint fallback authentication." into sc-dev 2021-06-04 00:12:40 +00:00
Sarah Chin
5fa39ffd17 setCdmaSubscription/RoamingMode returns when not CDMA
NoOp instead of return ISE when the device is not CDMA capable.

Test: atest TelephonyManagerTest
Fix: 175665470
Change-Id: I36d69f4bf337ef9c102327bfe87752c56847af87
Merged-In: I36d69f4bf337ef9c102327bfe87752c56847af87
2021-06-03 17:09:52 -07:00
Lucas Dupin
3989babf55 Merge "Expanding notification scrim to the edge of the screen" into sc-dev 2021-06-04 00:03:36 +00:00
Lucas Dupin
76fda9db9a Merge "Dim wallpaper by setting wallpaper layer transparency." into sc-dev 2021-06-03 23:49:25 +00:00
Seigo Nonaka
afc41562dc Merge "Calculate set of available fonts in native" into sc-dev am: cec02064d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14753056

Change-Id: If98590336b82bce5502bbc4b07a0615b2e0828cd
2021-06-03 23:30:24 +00:00
Jing Ji
9dc8714344 Merge "Re-compute oom adj in case cycles are found in partial update" into sc-dev am: f6d97cfa0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14753720

Change-Id: I4ab6c784082b760a3b454c94bce1f8e445a66e42
2021-06-03 23:29:58 +00:00
Seigo Nonaka
cec02064d4 Merge "Calculate set of available fonts in native" into sc-dev 2021-06-03 23:26:17 +00:00
Jing Ji
f6d97cfa0b Merge "Re-compute oom adj in case cycles are found in partial update" into sc-dev 2021-06-03 23:11:54 +00:00
Jing Ji
d33a369574 Merge "Set the pid of ProcessProfileRecord for system_server" into sc-dev am: 32f5e8947a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14827238

Change-Id: I89166a1b478dd84231837ed844cc92e32b432295
2021-06-03 22:53:02 +00:00
Jing Ji
32f5e8947a Merge "Set the pid of ProcessProfileRecord for system_server" into sc-dev 2021-06-03 22:46:35 +00:00
Sudheer Shanka
e595ce17b1 Merge "Check only if the app is installed on the other user for blob access." into sc-dev am: 2c6a28a5ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14788767

Change-Id: Ib68d1d2d3c034bd92540e7d69da468ac4b534dca
2021-06-03 22:38:00 +00:00
Sudheer Shanka
2c6a28a5ea Merge "Check only if the app is installed on the other user for blob access." into sc-dev 2021-06-03 22:31:50 +00:00
Sudheer Shanka
6feb5cdf42 Merge "Don't attribute a blob to a user if there are leasees from other users." into sc-dev am: 08ad40f2d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14796666

Change-Id: Ibd678c29934ff7de8d6cb11d8ba9996b0a845d6d
2021-06-03 22:31:34 +00:00
Chris Tate
587acbbc2f Merge "Fix FGS enter/exit statslog semantics" into sc-dev am: d3a0befee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14823656

Change-Id: I0690cb6e354fa1a6dc8a58286bc717ef6ad77b6b
2021-06-03 22:31:10 +00:00
Cassie Wang
f2afc74112 Merge "Update VisibilityStore to handle role-based system visibility." into sc-dev am: bf90bb447e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550484

Change-Id: Ifddaed2afa42e5130e495f45c8e648e3c9ba3b96
2021-06-03 22:30:37 +00:00
Sudheer Shanka
08ad40f2d9 Merge "Don't attribute a blob to a user if there are leasees from other users." into sc-dev 2021-06-03 22:30:22 +00:00
Ilya Matyukhin
2820eb892e Merge "Refactor the HBM layer and add completion callbacks" into sc-dev am: bfc5b7abeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14826346

Change-Id: I7fa5da5bd39cce08fe6cff7b274a69a8edaf2c4f
2021-06-03 22:30:07 +00:00
Chris Tate
d3a0befee4 Merge "Fix FGS enter/exit statslog semantics" into sc-dev 2021-06-03 22:19:23 +00:00
Cassie Wang
bf90bb447e Merge "Update VisibilityStore to handle role-based system visibility." into sc-dev 2021-06-03 22:16:06 +00:00
Ilya Matyukhin
bfc5b7abeb Merge "Refactor the HBM layer and add completion callbacks" into sc-dev 2021-06-03 22:15:18 +00:00
TreeHugger Robot
e7a3c9158c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: de090c520c -s ours am: 04ac4eb7e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ea1ab6bfa38e860967a5de03cf4febdd73f4481
2021-06-03 22:07:38 +00:00
TreeHugger Robot
65d618bc33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0292cc243d -s ours am: 335210d983 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1351ed6fbd1432118d138c53480a8a6e15989c4f
2021-06-03 22:07:26 +00:00
TreeHugger Robot
04ac4eb7e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: de090c520c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac116976e5569d78d10dfbee808f30ae20d8d543
2021-06-03 22:00:04 +00:00
TreeHugger Robot
335210d983 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0292cc243d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I16a97a5f99e3b1b109b11058f3dca7444a991bbf
2021-06-03 21:59:43 +00:00
Chris Tate
80c24e4d81 Merge "Fix false-positive matching of notification to FGS" into sc-dev am: ff3d2907e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14823049

Change-Id: Ic95a76549e84320ca7c571cb7d71cf27ddfb64be
2021-06-03 21:58:59 +00:00
TreeHugger Robot
de090c520c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-03 21:56:59 +00:00
TreeHugger Robot
0292cc243d Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-03 21:44:44 +00:00
Joe Bolinger
9f685a9fa7 Fix feedback and animations for face to fingerprint fallback authentication.
Bug: 189164072
Test: atest com.android.systemui.biometrics com.android.server.biometrics
Change-Id: I7fe8085dc4a4994c591bb4be20309ffb46bb06e9
2021-06-03 14:41:29 -07:00
Chris Tate
ff3d2907e8 Merge "Fix false-positive matching of notification to FGS" into sc-dev 2021-06-03 21:39:11 +00:00
Jing Ji
700394acca Merge "Remove some system_server_wtf in proc stats tracking" into sc-dev am: d1c9c0785c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14804421

Change-Id: Idf5b8833ea8efa7496d6647300459a4410fca9bd
2021-06-03 21:29:21 +00:00
Jing Ji
682f1a9f91 Merge "Do not kill process bound with WAIVE_PRIORITY / ALLOW_OOM_MANAGEMENT" into sc-dev am: 35b2d00e79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14766840

Change-Id: I82068dc0ec0b8c48cf00eab78cd27d2f5444d0b3
2021-06-03 21:28:37 +00:00
Jing Ji
d1c9c0785c Merge "Remove some system_server_wtf in proc stats tracking" into sc-dev 2021-06-03 21:15:33 +00:00
Jing Ji
35b2d00e79 Merge "Do not kill process bound with WAIVE_PRIORITY / ALLOW_OOM_MANAGEMENT" into sc-dev 2021-06-03 21:15:05 +00:00
Jing Ji
7ce2715fa7 Set the pid of ProcessProfileRecord for system_server
Bug: 190084282
Test: Manual - Capture system heap dump, verify notification is posted
Change-Id: I53e05a644280add45b268c96bdcc74727e4f8ca3
2021-06-03 14:03:35 -07:00