Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
618,571 Commits 3 Branches 0 Tags
9f41f95bedcded6ec1ee6bdeaa60ff42706dc595
Commit Graph

618571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
9f41f95bed Merge changes I915e0c4e,Iae187c0b am: c8387d8128 am: 551f4c523a am: a363ff4070 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80553b02c97bf3e97eaf8af8b83a9b7239f22b75
 2021-01-14 04:41:30 +00:00
Benedict Wong
a363ff4070 Merge changes I915e0c4e,Iae187c0b am: c8387d8128 am: 551f4c523a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32b7147de91fa5878dbba5e95bf897912136cedf
 2021-01-14 04:20:02 +00:00
TreeHugger Robot
f65debad48 Merge "Update sensor posision for O6" 2021-01-14 04:08:12 +00:00
Joe Huang
c019a90151 Merge "Add Satellite PVT AIDL (framework/JNI)" 2021-01-14 03:56:18 +00:00
Bill Yi
bdd177585c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-14 03:48:55 +00:00
Winson Chung
f74cdbed2f Merge changes I0ea9aae2,I369e83cb 
* changes:
  5/ Update splitscreen to use shell main thread
  4/ Update HideDisplayCutout and AppPairs to use shell main thread
 2021-01-14 03:38:50 +00:00
TreeHugger Robot
a49fe859e6 Merge "Plumb UDFPS overlay "show reason" from FingerprintService to SysUI" 2021-01-14 03:30:56 +00:00
TreeHugger Robot
0d311d0ed3 Merge "Fail idmap parsing earlier if version differs" 2021-01-14 03:29:14 +00:00
TreeHugger Robot
1686fa0f92 Merge "Separate window and monitor ANR notifications" 2021-01-14 03:20:43 +00:00
TreeHugger Robot
99db18e28a Merge "Defer window removal including app transition" 2021-01-14 02:11:06 +00:00
Ryan Mitchell
9289a04315 Fail idmap parsing earlier if version differs 
Variable length strings are now in the idmap format. Idmap attempts to
parse the old idmap files using the new format and can interpret old
data as the length of a variable length string.

Fail parsing idmap header early if the idmap magic or version differs
from what is expected.

Bug: 177295273
Test: boot, apply change, reboot
Change-Id: I2914f11547424457fdb78de0ad03976e1fc81084
 2021-01-13 17:53:47 -08:00
TreeHugger Robot
924bcf6427 Merge "[CEC Configuration] Use listeners from the HdmiCecConfig instead of Global Settings" 2021-01-14 01:44:28 +00:00
TreeHugger Robot
a7cf2f79e8 Merge "[CEC Configuration] Add @SystemApi for CEC Configuration" 2021-01-14 01:27:14 +00:00
Roshan Pius
73bfb1d48e Merge changes from topic "revert-13329427-revert-13274595-XTPTORCRLV-WLDUPFEJWD" 
* changes:
  NetworkControllerWifiTest: Fix unit tests
  Revert "Revert "NetworkCapabilities: Embed location senstive Tra..."
 2021-01-14 01:19:34 +00:00
TreeHugger Robot
96f9d15ffe Merge "Add new owner" 2021-01-14 01:19:15 +00:00
Kweku Adams
390f602f0e Merge "Remove obsolete allowlisting call." 2021-01-14 00:53:52 +00:00
TreeHugger Robot
d76702e2b9 Merge "Add idmap completely parsed assertion" 2021-01-14 00:45:25 +00:00
Benedict Wong
551f4c523a Merge changes I915e0c4e,Iae187c0b am: c8387d8128 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62cc28e59b358b6f996416f7dc6b80f620e7c18a
 2021-01-14 00:21:32 +00:00
TreeHugger Robot
e795f5ed44 Merge "Turn on vk unit tests" 2021-01-14 00:12:19 +00:00
Jiashen Wang
41b531f3d1 Merge "Init DownloadableSubscription with Confirmation Code" 2021-01-13 23:59:55 +00:00
Benedict Wong
c8387d8128 Merge changes I915e0c4e,Iae187c0b 
* changes:
  Add utility methods for creation of NetInfo, NetCaps, and LinkProps
  Add VcnGatewayConnection state skeleton, signals and fields
 2021-01-13 23:45:17 +00:00
Adam Bookatz
2dd6b2b344 Merge "UserManager restricted profile SystemApis" 2021-01-13 22:47:26 +00:00
Alec Mouri
aa3e498bbc Turn on vk unit tests 
* Degrade error when changing the rendering backend from Properties to
no longer be fatal.
* Support using a single graphics queue for the Vulkan backend. Cloud
devices only support a single queue and some Vulkan implementations such
as Swiftshader expose only one queue for simplying their implementation,
so we'll need to support one.

Bug: 175618060
Bug: 162628999
Test: hwui_unit_tests
Test: experiment on Pixel 4 enforcing a single queue (settings app,
maps, sysui)

Change-Id: I495fcabc3c89bd62bbb833998eab4944c6660f6f
 2021-01-13 14:35:58 -08:00
Roshan Pius
d9852d6199 NetworkControllerWifiTest: Fix unit tests 
Mock WifiInfo.makeCopy() since that is used by NetworkCapabilities for
copies now.

Bug: 177390648
Test: atest com.android.systemui.statusbar.policy.NetworkControllerWifiTest
Change-Id: I71e5c757b68bcbd70fb89cf94ecbb4b7269cad19
 2021-01-13 22:28:38 +00:00
Roshan Pius
0143b056bf Revert "Revert "NetworkCapabilities: Embed location senstive Tra..." 
Revert^2 "WifiLocationTest: Add test for Wifi TransportInfo"

b548aac6081a6899e966d7a8d961f2a47147e244

Exempt-From-Owner-Approval: Reland of approved CL

Bug: 162602799
Bug: 177390648
Test: atest com.android.systemui.statusbar.policy.NetworkControllerWifiTest
Change-Id: Iec8d1441e8d02ff43037fdcb0c90065adff8e716
 2021-01-13 22:28:01 +00:00
Kevin Chyn
59707e2189 Plumb UDFPS overlay "show reason" from FingerprintService to SysUI 
Enables SysUI to draw enroll/auth-specific affordances

If the UI diverges, we can consider enroll or auth specific
UdfpsView subclasses(?) but currently enrollment just shows
an extra circle.

Fixes: 177275693
Test: atest com.android.systemui.biometrics

Change-Id: I5b2aaf00c55279a81348ec7a5dc387b6e62751c0
 2021-01-13 14:24:19 -08:00
Wale Ogunwale
a0f9c56968 Merge "Additional interfaces for main/side stage split-screen model" 2021-01-13 22:17:35 +00:00
Todd Kennedy
3060654c8f Merge "add new owners for IntentFilter and Intent" am: c9e61a5c83 am: 5fcf36eefe am: cceb8b5a97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5197a46d7267a8ee6ea383b98b9eedac491a4da
 2021-01-13 21:20:05 +00:00
Sudheer Shanka
d1e98725f9 Merge "Update language to comply with Android’s inclusive language guidance." am: 5eb8de6ed7 am: d8d2a05841 am: ed31406794 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8a8b2fda3d13f9cb80a9c282b8494ae7a29b629
 2021-01-13 21:19:29 +00:00
Sudheer Shanka
84aeb1bcdd [automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: 569a4f746e am: 7e2c5975c5 am: 976b9f84a0 -s ours 
am skip reason: Change-Id If04f63361bab424abf5aa6e980067f689fd46622 with SHA-1 89ed673fc8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib75164567d6f06552cc3852424229b31d7c52877
 2021-01-13 21:18:10 +00:00
Anna Zappone
b1eb8126ae Merge "Add nonpriority conversations into sorted Recents" 2021-01-13 20:56:50 +00:00
Todd Kennedy
cceb8b5a97 Merge "add new owners for IntentFilter and Intent" am: c9e61a5c83 am: 5fcf36eefe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b89d19806bd96e3af6f8b93cb23db6faa641634
 2021-01-13 20:47:21 +00:00
Sudheer Shanka
ed31406794 Merge "Update language to comply with Android’s inclusive language guidance." am: 5eb8de6ed7 am: d8d2a05841 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5470cd0ec05cec7f43d1582876e2c6bde79acc66
 2021-01-13 20:47:11 +00:00
Sudheer Shanka
976b9f84a0 Merge "Update language to comply with Android’s inclusive language guidance." am: 569a4f746e am: 7e2c5975c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545585

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ef621f757b9a838efc118bf4034ce429c5a6b2
 2021-01-13 20:47:00 +00:00
Sunny Goyal
5741f2d3c5 Merge "Fixing button state not updated when NavBar is recreated" 2021-01-13 20:39:39 +00:00
Todd Kennedy
5fcf36eefe Merge "add new owners for IntentFilter and Intent" am: c9e61a5c83 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd029726f8465829b567baafde25c573e53a97c8
 2021-01-13 20:24:35 +00:00
Sudheer Shanka
d8d2a05841 Merge "Update language to comply with Android’s inclusive language guidance." am: 5eb8de6ed7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95e287032463bd149e484d7ce9109ced17ecefae
 2021-01-13 20:20:41 +00:00
Sudheer Shanka
7e2c5975c5 Merge "Update language to comply with Android’s inclusive language guidance." am: 569a4f746e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545585

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bd17f611f77464cc2567ee431e9309fdf12a6d2
 2021-01-13 20:16:27 +00:00
TreeHugger Robot
eeed46fd0b Merge "Remove indoorProbability from NLP extras before delivering to clients" 2021-01-13 19:57:55 +00:00
Bernardo Rufino
79745b3cae Merge "Deprecate Intent.ACSD" 2021-01-13 19:57:46 +00:00
Adam Bookatz
20ba13f5bc UserManager restricted profile SystemApis 
Makes two new SystemApis:
getRestrictedProfileParent()
canHaveRestrictedProfile()

Temporarily disables VPN Tests that rely on the old APIs until those
tests are updated (b/175883995).

Bug: 171529940
Test: atest FrameworksNetTests:com.android.server.connectivity.VpnTest
Test: Tests for UserManager SystemApis are TODO awaiting completion of new user test infrastructure (b/163890431)
Change-Id: I28e39400039631e7d391dc7b0d003e8a38d1f06a
 2021-01-13 11:53:33 -08:00
Evan Rosky
bf982054fe Merge "Finish incomplete merge" 2021-01-13 19:52:22 +00:00
Todd Kennedy
c9e61a5c83 Merge "add new owners for IntentFilter and Intent" 2021-01-13 19:47:10 +00:00
Sudheer Shanka
5eb8de6ed7 Merge "Update language to comply with Android’s inclusive language guidance." 2021-01-13 19:44:53 +00:00
Winson Chung
c31ec3d518 Merge "Migrate FrameTracker to use ST Jank information" 2021-01-13 19:36:00 +00:00
Kweku Adams
2bff47105e Remove obsolete allowlisting call. 
The integrity service has moved inside of the system server. There's
no need to put the system on the temp allowlist.

Bug: 142420609
Test: atest AppIntegrityManagerServiceImplTest
Test: atest CtsContentTestCases
Test: atest FrameworksCorePackageManagerTests
Change-Id: If8297fd7e5f40221e6916fc3ec49c36198a974eb
 2021-01-13 11:28:59 -08:00
Sudheer Shanka
569a4f746e Merge "Update language to comply with Android’s inclusive language guidance." 2021-01-13 19:19:54 +00:00
Evan Rosky
94c1b01e6e Finish incomplete merge 
Bug: 177440160
Test: builds
Change-Id: Idfb134838e44a72e2c1eef31740e0e2eea47b6b8
 2021-01-13 11:19:27 -08:00
Wale Ogunwale
8531eb85a4 Additional interfaces for main/side stage split-screen model 
Add some more interfaces APIs for manipulating main/side stage
split-screen.
Also, renamed pinTask/unpinTask to moveToSideStage/removeFromSideStage
for consistency.

Test: Command line
Bug: 176061049
Change-Id: Ic5b909c42e027e6f4809931c6dc92af1bf79b050
 2021-01-13 11:12:38 -08:00
Treehugger Robot
9629297286 Merge "AbsSeekBarTest: Fix dpToPixel computation" am: 72df4073ea am: f26a5b003b am: a9a80c7e7e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37559f09675ac048501f4b58a57b348f80e72775
 2021-01-13 18:54:13 +00:00