651059 Commits

Author SHA1 Message Date
Treehugger Robot
a8c44879f1 Merge "Update PhoneAccountHandle API docs." am: 95a0ece6cc am: 36b124ccb7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755371

Change-Id: I131e8b037099a84b9f43aba0a681ec9ddcf12644
2021-07-13 05:50:07 +00:00
Rajeev Kumar
e0838db261 Merge "Enable hibernation by default" into sc-dev am: 8b9df5b6b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15167236

Change-Id: I952ca5a4ba6a406110a459aee6ac49c6f8abde8d
2021-07-13 05:48:59 +00:00
Rajeev Kumar
8b9df5b6b1 Merge "Enable hibernation by default" into sc-dev 2021-07-13 05:35:34 +00:00
Treehugger Robot
36b124ccb7 Merge "Update PhoneAccountHandle API docs." am: 95a0ece6cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755371

Change-Id: I3b4ea7a3f5c85a5a0c5b693ef97abf8a1e486dcd
2021-07-13 05:34:51 +00:00
Treehugger Robot
95a0ece6cc Merge "Update PhoneAccountHandle API docs." 2021-07-13 05:20:14 +00:00
Bill Yi
9cd06921f9 [automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: 5db75b67a5 -s ours am: dd554702fd -s ours
am skip reason: Merged-In I867df303b8da1b9748e5a775dd8bf4a1b910c434 with SHA-1 7358684565 is already in history

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

Change-Id: I6001e7b161076adab8ab04276d460e47978a1fd9
2021-07-13 01:21:31 +00:00
Bill Yi
dd554702fd [automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: 5db75b67a5 -s ours
am skip reason: Merged-In I867df303b8da1b9748e5a775dd8bf4a1b910c434 with SHA-1 7358684565 is already in history

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

Change-Id: Ic43c17a485281ac7c338cc3b30007f238e03d59c
2021-07-13 01:02:56 +00:00
Kevin Chyn
66c82ac990 Merge "Do not respond to ACSD if authing for keyguard" into sc-dev am: 09cb5879a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15262478

Change-Id: Ib4138eb8245a816fc7219582ba7e1021c46e0b71
2021-07-13 01:01:02 +00:00
Kevin Chyn
09cb5879a1 Merge "Do not respond to ACSD if authing for keyguard" into sc-dev 2021-07-13 00:48:51 +00:00
Bill Yi
5db75b67a5 Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" 2021-07-13 00:48:38 +00:00
TreeHugger Robot
dfd3c926ab Merge "Apply pending AppInfo on Activity override change" into sc-dev am: d2dd630204
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15260966

Change-Id: I311409dbd669049ca5cbc46f6f58bb6d0f51de19
2021-07-13 00:37:28 +00:00
TreeHugger Robot
cee250576e Merge "Remove isAppStartModeDisabled binder entry point" into sc-dev am: f59bf68628
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246166

Change-Id: I8e059e17c333b9a6f4fd809845f93de759745169
2021-07-13 00:37:17 +00:00
Riddle Hsu
72c1fe680b Merge "Skip marking recents as pending top if it is already on top" into sc-dev am: 0c94b5293d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15259271

Change-Id: I24e4dfdfe5565b250f0f85b8cdb38d9214c137db
2021-07-13 00:37:04 +00:00
TreeHugger Robot
289be664b7 Merge "Increase max allowed min update jitter to 30s" into sc-dev am: 224f71520f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245514

Change-Id: Iad07bd8180b3f9702579a01f70425444472f6822
2021-07-13 00:36:48 +00:00
TreeHugger Robot
54bca02186 Merge "Fix cancel not working for FingerprintDetectClient" into sc-dev am: c2a76f90a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15247831

Change-Id: I96f47d31d7173bf1eb02da0f15b38df6d7a94158
2021-07-13 00:36:32 +00:00
Jeff DeCew
ffdbe187a6 Merge "Use SRC_ATOP instead of SRC_IN for blending the NotificationExpandButton" into sc-dev am: d14c60be51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237912

Change-Id: Iab479860b685db90eee761f98d5d450bd8907a4c
2021-07-13 00:36:19 +00:00
TreeHugger Robot
08c932f8bc Merge "Remove unnecessary log in CursorWindow.create" into sc-dev am: 2c522a3910
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15225375

Change-Id: Ibe80b0fd21ee478bfb0b471605b08bee8c60dca2
2021-07-13 00:36:05 +00:00
Nikita Ioffe
838dd43345 Merge "Fix PackageManager query API's related to rebootless APEX updates" into sc-dev am: 09f8e5de00
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245533

Change-Id: I1373c1a698743b9d9dcc90fc40c158bf528a39ac
2021-07-13 00:35:51 +00:00
TreeHugger Robot
a2543f2b12 Merge "Fix configuration activity colors for accessibility" into sc-dev am: 71f911e7e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15259790

Change-Id: I5c1d0d0e7c392fa693699784acaaaee0bb069371
2021-07-13 00:35:38 +00:00
TreeHugger Robot
40f15f77d7 Merge "Fix misspelled on the comment" into sc-dev am: f7c7e7daf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15247633

Change-Id: I3379aae2a153924a79f5b32493a1615aa738b014
2021-07-13 00:35:10 +00:00
TreeHugger Robot
6ddb83ec49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: b8151fc862 -s ours am: f3c6f975fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id18af7aaefc00e7686bef97db107c7cfe10e8432
2021-07-13 00:35:00 +00:00
TreeHugger Robot
c8a3fa63be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 23061f1b50 -s ours am: b524d9932f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5404eaad2c05f0c9ec683d0e2bacf69b4c3ba7cd
2021-07-13 00:34:24 +00:00
Ahaan Ugale
ab354b6d70 Merge "Check/note ops when delivering HotwordDetectedResult" into sc-dev am: e360fc69a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15241921

Change-Id: Ic5d1308896f9b8c1c7c31f17f56b446b855c1115
2021-07-13 00:34:13 +00:00
Treehugger Robot
313ac6b066 Merge "Fix a potential NPE when allocating space for compressed apex" am: 2a0c9de597 am: dc7fc8bb6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763189

Change-Id: I4be2f02c5ec0cda1938c8ef3d07817933b10c9d1
2021-07-13 00:02:34 +00:00
TreeHugger Robot
f4890361d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2992fd24ea -s ours am: 1634df7f13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I87b7afbf6e432e9423b3bb649d5298cf717d48bd
2021-07-12 23:54:22 +00:00
TreeHugger Robot
da3a71e33c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 10adeb8360 -s ours am: 4c27d59fa9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62ab6acc3bb27d9f5b5faa6877b0947a75e5c466
2021-07-12 23:54:15 +00:00
TreeHugger Robot
e97545b387 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 77279d6efc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia084fa73c821dfe4ce44492a2ab60de4b18a16bb
2021-07-12 23:53:46 +00:00
Jeff DeCew
af026d32f7 Merge "Ensure stackHeight accounts for pulseHeight and dozeAmount where we used to use innerHeight." into sc-dev am: 6645cb8ac9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189496

Change-Id: Ic47fe03e9310cb6120b163d8c9793b11b0289c17
2021-07-12 23:52:48 +00:00
Kalesh Singh
4e5c3e2813 [automerger skipped] Merge "getGpuDmaBufUsageKb: Report usage in Kilobytes" into sc-dev am: 34ce365659 -s ours
am skip reason: Merged-In Ie17382794f7e4db34ddadf75488d8f82de435ae0 with SHA-1 d83171d954 is already in history

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

Change-Id: I967d57e9ce57f4d0d8c52ab57aaef2a593b51d69
2021-07-12 23:52:03 +00:00
TreeHugger Robot
c045769a4f Merge "Add unregisterClient in instance close." into sc-dev am: f03fa75cc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15238310

Change-Id: I9fde432414d7c295548c4dd5f057a4d81105ba53
2021-07-12 23:51:43 +00:00
Riddle Hsu
1cd18d3035 Merge "Sync client visibility if activity is stopped" into sc-dev am: be851a2ae3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15258890

Change-Id: I3c0c20191c6f3e1f40b4900c6a1a6dc8c445c834
2021-07-12 23:50:42 +00:00
TreeHugger Robot
9d485fc15d Merge "Revert "Replace cancel button with a delete icon."" into sc-dev am: 9bdcb467fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246355

Change-Id: Ia1a75f1df3292c4ca5822fc600493eebeab3ecb3
2021-07-12 23:50:28 +00:00
TreeHugger Robot
584c97a1ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ed3d4b36d6 -s ours am: b96d192aee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2ff18e560b0fb0c0f3142ff28de21434470d224f
2021-07-12 23:50:16 +00:00
TreeHugger Robot
25be4b576c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 73a3915f62 -s ours am: 5bd2548fea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47cca82c542f19c99881d90e5c40dda4dc81b430
2021-07-12 23:50:06 +00:00
TreeHugger Robot
06450a62bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2468d75167 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I762c258e104f8d5125cf43cc31181301c9f15c0a
2021-07-12 23:49:57 +00:00
Lyn Han
1057fae460 Merge "Do not cancel quick settings expansion onQsIntercept(down)" into sc-dev am: 1b0d9eb5c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237696

Change-Id: Ie976d8bf7bc4a79512f69ef7d83aabf372fcca36
2021-07-12 23:49:25 +00:00
Nikita Ioffe
246d76257a Merge "Drop prebuilt files to android source tree." into sc-dev am: 0bddb6bf54
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235240

Change-Id: I40634df10a7222ddac62653654c0e3f3e38853e9
2021-07-12 23:48:58 +00:00
Nikita Ioffe
777ee9489f Merge "Treat APEX installs as upgrades" into sc-dev am: bdf97e12ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245531

Change-Id: I415022682ed3d58501a2b7d6c22cce957ddb2db2
2021-07-12 23:48:35 +00:00
Albert Wang
e1c1fcecfb Merge "Update USB HAL version early" into sc-dev am: 039b7ccc83
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15142887

Change-Id: I6fab0f56aa8cf81a7fee6c8d7cf6170102934842
2021-07-12 23:48:17 +00:00
Beverly Tai
2d32dfc77f Merge "Don't animate weight to 0 on face unlock bypass" into sc-dev am: 01feaca6e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245437

Change-Id: I01ba4475cc8987a71a003e63a3e5bb4801160c1b
2021-07-12 23:47:39 +00:00
Beverly Tai
95d7a7542b Merge "Update udfps fade + padding" into sc-dev am: 7a900474fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15238163

Change-Id: Icccf51ad6c3b27c2af6a3cdbe5dbe41faf682c09
2021-07-12 23:47:25 +00:00
TreeHugger Robot
befc6419c1 Merge "Also check for home activity in BAL" into sc-dev am: 38f16f29d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235793

Change-Id: I2751672e0617ec8e42c917c2d0afcc52a21d45e2
2021-07-12 23:47:02 +00:00
Bill Yi
fd7a9cde43 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75d9fd945b -s ours am: a70e4ce80a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6652d377add1d3b0f49ed2c5951f624319d30ca9
2021-07-12 23:46:44 +00:00
Bill Yi
52c20707fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d37fc464c -s ours am: 0c82623ff4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9895b4ec3b00df9cf6dc7db900910cfa38092988
2021-07-12 23:46:38 +00:00
Peiyong Lin
2153e5ea4c Merge "Avoid print stack trace." into sc-dev am: 2104b875a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191966

Change-Id: I6f66a556dbf5a7de6a162419b7e56108f95bb414
2021-07-12 23:46:30 +00:00
TreeHugger Robot
d690e0f32d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 619cb84da9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0727e5bb1eaa7aceaf9e065d3a707ff018ddf367
2021-07-12 23:46:15 +00:00
TreeHugger Robot
d2dd630204 Merge "Apply pending AppInfo on Activity override change" into sc-dev 2021-07-12 23:46:03 +00:00
TreeHugger Robot
eed30d1b64 Merge "Properly protect mFrameMetricsReporter" into sc-dev am: 1e67f86165
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15194545

Change-Id: I8bf23a3e581bf39d0f95e32d13a32afb9eb4a577
2021-07-12 23:45:57 +00:00
TreeHugger Robot
ff616a2749 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b2cc1875da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91bcea009ab4990cd2b07bac4f30cdb5e15661bf
2021-07-12 23:45:43 +00:00
Treehugger Robot
dc7fc8bb6a Merge "Fix a potential NPE when allocating space for compressed apex" am: 2a0c9de597
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763189

Change-Id: I7a17c2de6d487aafb0b053a64c69616ecc811932
2021-07-12 23:45:30 +00:00