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

731599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shubang Lu
51693ff8ec Merge changes from topic "TIAF_attrs" 
* changes:
  TIAF: handle TIAS XML and build TIAS info
  TIAF: Add attr for TV interactive app service
 2021-11-16 18:21:12 +00:00
Caitlin Cassidy
ae90b55549 [automerger skipped] Merge "[Status Bar Refactor] Define a new dagger component that gets re-created each time CollapsedStatusBarFragment is re-created." into sc-v2-dev am: fe4103f50d am: f887324f2d -s ours 
am skip reason: Merged-In I3a6f9cfeae644e41836fbaa53495fe31a71b0a7e with SHA-1 1148cee991 is already in history

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

Change-Id: I501752e4fcf4aa03ec022372b53f5a47cd63c27a
 2021-11-16 18:10:59 +00:00
Winson Chung
d3c715de42 Merge "Skip adding shell drop target window for virtual displays" into sc-v2-dev am: 91a8c3068b am: 6cc3a2989e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16267066

Change-Id: Iee55b15f4a030d50e3484cb5a235c6dc84b6e090
 2021-11-16 18:09:55 +00:00
Jing Ji
10b954a7f2 Merge "Fix race conditions in removing dying process record" 2021-11-16 18:09:16 +00:00
Caitlin Cassidy
f887324f2d Merge "[Status Bar Refactor] Define a new dagger component that gets re-created each time CollapsedStatusBarFragment is re-created." into sc-v2-dev am: fe4103f50d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16211208

Change-Id: I244ab9130fda27bbdd91bd0b6dcd8aa4df0915dc
 2021-11-16 18:04:05 +00:00
Caitlin Cassidy
fe4103f50d Merge "[Status Bar Refactor] Define a new dagger component that gets re-created each time CollapsedStatusBarFragment is re-created." into sc-v2-dev 2021-11-16 17:57:42 +00:00
Winson Chung
6cc3a2989e Merge "Skip adding shell drop target window for virtual displays" into sc-v2-dev am: 91a8c3068b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16267066

Change-Id: I8768ca359202589a54af1bc0ac74f2291cbbe0f1
 2021-11-16 17:55:55 +00:00
Winson Chung
91a8c3068b Merge "Skip adding shell drop target window for virtual displays" into sc-v2-dev 2021-11-16 17:44:05 +00:00
Winson Chung
8c7ef9ef5c Skip adding shell drop target window for virtual displays 
- Having content on the virtual display can prevent mirroring from
  working correctly

Fixes: 205080647
Test: atest WMShellUnitTests
Change-Id: Id13d8e9020edf5f78c10148f48bd64cec92b7994
 2021-11-16 17:43:55 +00:00
Matt Casey
78337f8a21 Merge "Remove the unused assistant orb UI." into sc-v2-dev am: 525dec66cc am: 6e194cd39c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16247451

Change-Id: I53e2eabfdabb17a196c6f45e3bd1816c608e70ce
 2021-11-16 16:51:50 +00:00
Jamie Garside
50701a0bd3 Merge "Fix bugs with QS customizer when split shade is active." into sc-v2-dev am: 1351c6f6d6 am: 8aafc9d814 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16123522

Change-Id: I1c95ea4ef645b595f3a7da2bdd5e2291a97dbf2f
 2021-11-16 16:50:56 +00:00
Sandeep Jawalkar
89d29b89d1 Merge "[MEP] eSIM API refactor to support MEP" 2021-11-16 16:46:03 +00:00
TreeHugger Robot
1d8b5a56f6 Merge "Remove redundant settings." 2021-11-16 16:44:41 +00:00
Caitlin Cassidy
20b2d15084 Merge "[Status Bar Refactor] Define a new dagger component that gets re-created each time CollapsedStatusBarFragment is re-created." 2021-11-16 16:38:30 +00:00
Matt Casey
6e194cd39c Merge "Remove the unused assistant orb UI." into sc-v2-dev am: 525dec66cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16247451

Change-Id: I68660022a78c6372a2ddb8263b0fc00d64534fcd
 2021-11-16 16:37:48 +00:00
Jamie Garside
8aafc9d814 Merge "Fix bugs with QS customizer when split shade is active." into sc-v2-dev am: 1351c6f6d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16123522

Change-Id: I1f7b1c6d345e065339f1952e902ccaf92998f063
 2021-11-16 16:36:03 +00:00
Beverly Tai
f6a47736b3 Merge "Allow udfps when strong auth is required" 2021-11-16 16:20:20 +00:00
Eric Laurent
c234ea55e9 Merge "audio: add call redirection audio modes" 2021-11-16 16:17:57 +00:00
Matt Casey
525dec66cc Merge "Remove the unused assistant orb UI." into sc-v2-dev 2021-11-16 16:17:16 +00:00
Jamie Garside
1351c6f6d6 Merge "Fix bugs with QS customizer when split shade is active." into sc-v2-dev 2021-11-16 16:12:38 +00:00
Fabian Kozynski
2bf0645129 Merge "Show chevron on DndTile if it'd show dialog" into sc-v2-dev am: 635a90d46a am: 3f8490f74a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16263949

Change-Id: Ia176ddc3db58c6b2e37b44fe69dad8c50b3c8ca8
 2021-11-16 15:59:16 +00:00
Fabian Kozynski
3f8490f74a Merge "Show chevron on DndTile if it'd show dialog" into sc-v2-dev am: 635a90d46a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16263949

Change-Id: I400bf0a42ad01dcf1a950e3d95c71b4deb92dec6
 2021-11-16 15:58:56 +00:00
Tom Natan
eab1996658 Merge "Skip unknown change IDs when adding/removing overrides on release builds" into sc-v2-dev am: 7ff3fe9ca5 am: 20632becc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264358

Change-Id: I4d188ca90b3317b60764f22a1d2570c6ed7c3fe6
 2021-11-16 15:58:51 +00:00
Tom Natan
20632becc7 Merge "Skip unknown change IDs when adding/removing overrides on release builds" into sc-v2-dev am: 7ff3fe9ca5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16264358

Change-Id: I07a565cec471f8f72a0910a89767575421c84aba
 2021-11-16 15:57:33 +00:00
Treehugger Robot
2813ada9c8 Merge "Make mainline API defs visible to CTS." am: d1c32c0cac am: 4f95da1943 am: b2fd2c5a96 am: de9ea063b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682037

Change-Id: I040564150931398834a86c1a29646142703ca10b
 2021-11-16 15:56:48 +00:00
Fabian Kozynski
635a90d46a Merge "Show chevron on DndTile if it'd show dialog" into sc-v2-dev 2021-11-16 15:46:00 +00:00
Tom Natan
7ff3fe9ca5 Merge "Skip unknown change IDs when adding/removing overrides on release builds" into sc-v2-dev 2021-11-16 15:41:56 +00:00
Treehugger Robot
de9ea063b0 Merge "Make mainline API defs visible to CTS." am: d1c32c0cac am: 4f95da1943 am: b2fd2c5a96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682037

Change-Id: I60a2e512b735d24a2ea26deb49f8d504f8646169
 2021-11-16 15:35:30 +00:00
Treehugger Robot
b2fd2c5a96 Merge "Make mainline API defs visible to CTS." am: d1c32c0cac am: 4f95da1943 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682037

Change-Id: Ie61ce90ef16f76b84bb8587c381a12b11845d977
 2021-11-16 15:19:27 +00:00
Treehugger Robot
4f95da1943 Merge "Make mainline API defs visible to CTS." am: d1c32c0cac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682037

Change-Id: I5a7129e2c6ecc65d2fef48b04214b58cb536b28f
 2021-11-16 14:58:25 +00:00
Treehugger Robot
d1c32c0cac Merge "Make mainline API defs visible to CTS." 2021-11-16 14:40:00 +00:00
Beverly
11dddec1bf Allow udfps when strong auth is required 
Only disallow UDFPS usage if the device is
in lockdown or reboot. Otherwise, (for reasons like TIMEOUT
or SOME_AUTH_REQUIRED_AFTER_USER_REQUEST), we
allow the user to use fingerprint to authenticate; however,
the we will immediately bring up the bouncer instead of entering the
device.

Test: manual
Test: atest KeyguardUpdateMonitorTest
Fixes: 205556311
Change-Id: Ia7e56b7d9b857a76036161cbd6edd981bed3bb6c
 2021-11-16 13:26:50 +00:00
tomnatan
98f17c1f70 Skip unknown change IDs when adding/removing overrides on release builds 
Otherwise an exception is thrown because CompatConfig#isOverridable
returns false for an unknown change ID.

Fix: 205297182
Test: atest FrameworksServicesTests:CompatConfigTest
Test: atest FrameworksServicesTests:PlatformCompatTest
Change-Id: Id45ddd3226555d1169d9814517d2da336c1c7b1a
 2021-11-16 13:24:44 +00:00
SongFerng Wang
5505530a4b Merge "NullPointerException for Internet quick panel(slice) in Settings" into sc-v2-dev am: 7d75b59495 am: 7f01205017 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16260923

Change-Id: I1eca0930a7fdbdd257d34713ec940dceecf14398
 2021-11-16 11:08:59 +00:00
SongFerng Wang
7f01205017 Merge "NullPointerException for Internet quick panel(slice) in Settings" into sc-v2-dev am: 7d75b59495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16260923

Change-Id: Ic0c2640a78d9941071ea58a1916cae7edae44596
 2021-11-16 10:32:43 +00:00
SongFerng Wang
7d75b59495 Merge "NullPointerException for Internet quick panel(slice) in Settings" into sc-v2-dev 2021-11-16 10:22:19 +00:00
Neil Fuller
9e816cb183 Merge "Reverse ReferenceWithHistory.dump() order" am: a1afeb6910 am: e9736ffc78 am: 0900501df3 am: 6a62ae131a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892637

Change-Id: Iad3f9d21a8037c51d701ae23856f7c25ac9429d3
 2021-11-16 10:21:39 +00:00
Neil Fuller
6a62ae131a Merge "Reverse ReferenceWithHistory.dump() order" am: a1afeb6910 am: e9736ffc78 am: 0900501df3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892637

Change-Id: I3b8d604a946dead6f6dc777a32142a79961d68d0
 2021-11-16 10:08:29 +00:00
Neil Fuller
0900501df3 Merge "Reverse ReferenceWithHistory.dump() order" am: a1afeb6910 am: e9736ffc78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892637

Change-Id: If9a4f5881898c62e4e6cc7e87b1b30ef4bae2804
 2021-11-16 09:57:48 +00:00
Neil Fuller
e9736ffc78 Merge "Reverse ReferenceWithHistory.dump() order" am: a1afeb6910 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892637

Change-Id: Ife6269d4967a7d2588bc8f5bcc51eb06a1642a36
 2021-11-16 09:40:50 +00:00
TreeHugger Robot
b5a462807b Merge "Update the String for Wear OS" 2021-11-16 09:37:18 +00:00
TreeHugger Robot
21b332a1b2 Merge "Setting edge glow effect to white on Wear devices" 2021-11-16 09:36:52 +00:00
Neil Fuller
a1afeb6910 Merge "Reverse ReferenceWithHistory.dump() order" 2021-11-16 09:30:11 +00:00
TreeHugger Robot
dacf7193e3 Merge "Adjust the click point when magnification is activated" 2021-11-16 08:18:06 +00:00
Jing Ji
0120825e34 Fix race conditions in removing dying process record 
While waiting for the death of a process, if its subsequent process
record is created and killed immediately, we may end up removing
the former process record from the dying process list.

Bug: 201305599
Bug: 206336727
Test: Presubmit
Change-Id: I00521a5561d98f2df6f52443b9e23025faeaeb3c
 2021-11-16 00:04:58 -08:00
TreeHugger Robot
3053743c69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9b6bae8b4f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8ff36857efb162b6a4b4ed36543c58b7e1d22de
 2021-11-16 07:58:53 +00:00
TreeHugger Robot
e1a5a74c6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fa8f158180 -s ours am: 7184ee463b -s ours am: 52ce494d8a -s ours am: 5d75fa7407 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4545a2bb9e9ef5a71a6dac64c4e60d193da86573
 2021-11-16 07:47:03 +00:00
TreeHugger Robot
18ba00ff20 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 61d2cb4fce -s ours am: 2f84cf5dc6 -s ours am: 3f3bbfc428 -s ours am: 6ecb419b27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie374e360e0aa33d97b39ea6123233df5d0969284
 2021-11-16 07:46:44 +00:00
TreeHugger Robot
5f4b6c370e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 22b77795b1 -s ours am: faaf3e29ac -s ours am: 644f937c57 -s ours am: c212d73420 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86e0d21dd3b2168739b9356e8cd47ad76aa105df
 2021-11-16 07:46:23 +00:00
TreeHugger Robot
8b19e90188 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7a6c5ca061 -s ours am: 4f58265302 -s ours am: f36b39c3f0 -s ours am: 0a229465fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc59f7cae2b9e8df6b6efe414d74134c27f4c2ae
 2021-11-16 07:46:04 +00:00