Junyu Lai ea7f3662da Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 am: ce1b075b2b am: 93af32819c ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia294d4ec349db10f5486b27f733d4f6d223079bf

2021-02-03 04:32:04 +00:00

..

api

Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 am: ce1b075b2b am: 93af32819c

2021-02-03 04:32:04 +00:00

java

Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 am: ce1b075b2b am: 93af32819c

2021-02-03 04:32:04 +00:00

jni

Merge "New API methods to access external battery info" into sc-dev

2021-02-02 06:42:37 +00:00

proto

Merge "Add subsystem name field to Channel" into sc-dev

2021-01-28 21:36:10 +00:00

res

Merge "Add attr for nfc applications to configure support power states" am: 809b2f2459 am: 87e9535aa3

2021-02-03 03:31:45 +00:00

sysprop

Watchdog: Rename properties to follow guidelines

2021-01-27 21:57:53 +08:00

tests

Pass in split permissions to ParsingPackageUtils.

2021-02-02 11:42:40 -08:00

xsd

…

TEST_MAPPING

…