Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I63d935be434e88048d6e73e03d09c26795d07485
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:38:22 +00:00
committed by Automerger Merge Worker
parent 894063c6a0 66b67c6baf
commit 8cd6ea2c44
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/provider/Settings.java
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";