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

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

Change-Id: Ida878b8b938e84bb1a3ba0c0aae18bf5609ae348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-22 17:21:55 +00:00
committed by Automerger Merge Worker

View File

@@ -7086,7 +7086,7 @@ public final class Settings {
*
* @hide
*/
@Readable
@Readable(maxTargetSdk = Build.VERSION_CODES.S)
public static final String ALWAYS_ON_VPN_LOCKDOWN_WHITELIST =
"always_on_vpn_lockdown_whitelist";