Paul Hu 4c834140cf Merge "Replace NPMI#isUidNetworkingBlocked()" am: 830e1e9576 am: b3e4a2305d am: 505ac115c6 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53f5fb0996ad08c8a44c0560ab72725c47e39215

2021-02-05 08:15:29 +00:00

..

api

Merge "Exposed UserManager.isHeadlessSystemUserMode() as public API." into sc-dev

2021-02-05 07:00:35 +00:00

java

Merge "Replace NPMI#isUidNetworkingBlocked()" am: 830e1e9576 am: b3e4a2305d am: 505ac115c6

2021-02-05 08:15:29 +00:00

jni

Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." into sc-dev

2021-02-04 19:55:49 +00:00

proto

Merge "Log energy consumer result attribution data" into sc-dev

2021-02-04 23:07:39 +00:00

res

Merge "Create ux restricted customizations for DeviceDefault buttons and switches" into rvc-qpr-dev am: 89af47ea21 am: e9a7a1cf62

2021-02-05 02:50:40 +00:00

sysprop

…

tests

Merge changes from topic "window_context_2.0" into sc-dev

2021-02-05 04:53:09 +00:00

xsd

…

TEST_MAPPING

…