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

Commit 6e49f8e1 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 am: 66b67c6b am: 8cd6ea2c

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



Change-Id: I85bc8df53e3be98c75d90b70e1c0a99366a1ce62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c790f865 8cd6ea2c

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";