commit 44cd8dd482b855df72fc4bddb3b33247998798a2
author Songchun Fan <schfan@google.com> Tue Apr 12 23:28:30 2022 +0000
committer Songchun Fan <schfan@google.com> Tue Apr 12 23:39:00 2022 +0000
tree 85389cbc2471892b1baf5c0729f223d0f5bc94f1
parent 7605f736e4e1ab57f69e94a7f6807465fc59a3d5

[SettingsProvider] Add maxTargetSdk=S to ALWAYS_ON_VPN_LOCKDOWN_WHITELIST

Makes sure that third-party apps that target beyond S cannot access the
setting value directly from Settings.

BUG: 177239688
Test: manual with debug app
Change-Id: I2c5faad7f3e334704addc980530aae84c8c13864

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index d8d9c7f..98de387e 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7084,7 +7084,7 @@
          *
          * @hide
          */
-        @Readable
+        @Readable(maxTargetSdk = Build.VERSION_CODES.S)
         public static final String ALWAYS_ON_VPN_LOCKDOWN_WHITELIST =
                 "always_on_vpn_lockdown_whitelist";