Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 454aaa44 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[SettingsProvider] Add maxTargetSdk=S to... 

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

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



Change-Id: Ida878b8b938e84bb1a3ba0c0aae18bf5609ae348
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71959dcb 64b875e1

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -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";