diff options
| author | Charles He <qiurui@google.com> | 2017-08-15 15:30:22 +0100 |
|---|---|---|
| committer | Charles He <qiurui@google.com> | 2017-08-15 15:52:39 +0100 |
| commit | c57a01c16616f938eaa84ae5349a53efdec6e4cc (patch) | |
| tree | 148bb71f138ea97b15535bb7a60d20b9937e690d /core/java/android/net/VpnService.java | |
| parent | 4996a358434e62204a009f3f3c9d6fa261f741b4 (diff) | |
Opt-out for always-on VPN: rename API.
Rename the opt-out flag in AndroidManifest to
SERVICE_META_DATA_SUPPORTS_ALWAYS_ON
as directed by the API Council.
Bug: 64331776
Bug: 36650087
Test: runtest --path java/com/android/server/connectivity/VpnTest.java
Change-Id: I24326fad7a89083a2409134640bda81ee0359d08
Diffstat (limited to 'core/java/android/net/VpnService.java')
| -rw-r--r-- | core/java/android/net/VpnService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index 7fb0c47598c8..185b1818df45 100644 --- a/core/java/android/net/VpnService.java +++ b/core/java/android/net/VpnService.java @@ -152,9 +152,10 @@ public class VpnService extends Service { * </service> * } </pre> * - * <p>This meta-data field defaults to {@code true} if absent. + * <p>This meta-data field defaults to {@code true} if absent. It will only have effect on + * {@link android.os.Build.VERSION_CODES#O_MR1} or higher. */ - public static final String METADATA_SUPPORTS_ALWAYS_ON = + public static final String SERVICE_META_DATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON"; /** |