LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev

Browse Source 
am: 8b2513e439

Change-Id: Ie511c6f1034b75b4e797dbc0ca31c7c5c30f336e
This commit is contained in:
Charles He
2017-08-17 08:01:53 +00:00
committed by android-build-merger
parent 4842843b23 d681363fd1
commit 0aeecd42a9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/ConnectivityManager.java
View File

@@ -840,8 +840,8 @@ public class ConnectivityManager {
* In order to support the always-on feature, an app has to * In order to support the always-on feature, an app has to
* <ul> * <ul>
* <li>target {@link VERSION_CODES#N API 24} or above, and * <li>target {@link VERSION_CODES#N API 24} or above, and
* <li>not opt out through the {@link VpnService#METADATA_SUPPORTS_ALWAYS_ON} meta-data * <li>not opt out through the {@link VpnService#SERVICE_META_DATA_SUPPORTS_ALWAYS_ON}
* field. * meta-data field.
* </ul> * </ul>
* *
* @param userId The identifier of the user for whom the VPN app is installed. * @param userId The identifier of the user for whom the VPN app is installed.

2
tests/net/java/com/android/server/connectivity/VpnTest.java
View File

@@ -346,7 +346,7 @@ public class VpnTest extends AndroidTestCase {
// Apps that opt out explicitly are not supported // Apps that opt out explicitly are not supported
appInfo.targetSdkVersion = VERSION_CODES.CUR_DEVELOPMENT; appInfo.targetSdkVersion = VERSION_CODES.CUR_DEVELOPMENT;
Bundle metaData = new Bundle(); Bundle metaData = new Bundle();
metaData.putBoolean(VpnService.METADATA_SUPPORTS_ALWAYS_ON, false); metaData.putBoolean(VpnService.SERVICE_META_DATA_SUPPORTS_ALWAYS_ON, false);
svcInfo.metaData = metaData; svcInfo.metaData = metaData;
assertFalse(vpn.isAlwaysOnPackageSupported(PKGS[0])); assertFalse(vpn.isAlwaysOnPackageSupported(PKGS[0]));
} }