TreeHugger Robot 8453dbcc1c Merge "[SettingsProvider] Add maxTargetSdk=S to ALWAYS_ON_VPN_LOCKDOWN_WHITELIST" into tm-dev am: 64b875e125 am: 9069f4084d ...

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

Change-Id: I4248f5c34dbe2fed2a41be35dee3ed1c82ede83f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-04-22 17:38:20 +00:00

..

api

Merge changes from topic "PMS_remove_onlyCore"

2022-04-22 16:43:23 +00:00

java

Merge "[SettingsProvider] Add maxTargetSdk=S to ALWAYS_ON_VPN_LOCKDOWN_WHITELIST" into tm-dev am: 64b875e125 am: 9069f4084d

2022-04-22 17:38:20 +00:00

jni

Merge "javaObjectForIBinder: warn rets global and local" am: 2abd02381f am: fdb701f31d am: 1425072dcc am: 38c2645faa am: 67c9a74cbf

2022-04-22 06:13:12 +00:00

proto

Do not cleanup IME window if show is requested.

2022-04-21 21:34:31 +00:00

res

Merge "Add OEM config for enhanced confirmation mode and add restricted read ops" into tm-dev am: 0fbae018dc am: c3c5b9cd23

2022-04-22 15:44:37 +00:00

sysprop

…

tests

Merge "DeviceConfig for Chooser update-delay duration." into tm-dev

2022-04-22 16:03:38 +00:00

xsd

…

TEST_MAPPING

…