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

Commit 337ee077 authored Aug 17, 2017 by Charles He Committed by android-build-merger Aug 17, 2017

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

am: 8b2513e4

Change-Id: Ie511c6f1034b75b4e797dbc0ca31c7c5c30f336e

parents 883d71d2 8b2513e4

api/current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26062,8 +26062,8 @@ package android.net {
	method public boolean protect(java.net.Socket);		method public boolean protect(java.net.Socket);
	method public boolean protect(java.net.DatagramSocket);		method public boolean protect(java.net.DatagramSocket);
	method public boolean setUnderlyingNetworks(android.net.Network[]);		method public boolean setUnderlyingNetworks(android.net.Network[]);
	field public static final java.lang.String METADATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";
	field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";		field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";
			field public static final java.lang.String SERVICE_META_DATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";
	}		}

	public class VpnService.Builder {		public class VpnService.Builder {

api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28360,8 +28360,8 @@ package android.net {
	method public boolean protect(java.net.Socket);		method public boolean protect(java.net.Socket);
	method public boolean protect(java.net.DatagramSocket);		method public boolean protect(java.net.DatagramSocket);
	method public boolean setUnderlyingNetworks(android.net.Network[]);		method public boolean setUnderlyingNetworks(android.net.Network[]);
	field public static final java.lang.String METADATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";
	field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";		field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";
			field public static final java.lang.String SERVICE_META_DATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";
	}		}

	public class VpnService.Builder {		public class VpnService.Builder {

api/test-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26206,8 +26206,8 @@ package android.net {
	method public boolean protect(java.net.Socket);		method public boolean protect(java.net.Socket);
	method public boolean protect(java.net.DatagramSocket);		method public boolean protect(java.net.DatagramSocket);
	method public boolean setUnderlyingNetworks(android.net.Network[]);		method public boolean setUnderlyingNetworks(android.net.Network[]);
	field public static final java.lang.String METADATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";
	field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";		field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";
			field public static final java.lang.String SERVICE_META_DATA_SUPPORTS_ALWAYS_ON = "android.net.VpnService.SUPPORTS_ALWAYS_ON";
	}		}

	public class VpnService.Builder {		public class VpnService.Builder {

core/java/android/app/admin/DevicePolicyManager.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3939,7 +3939,7 @@ public class DevicePolicyManager {
	* {@link android.Manifest.permission#BIND_VPN_SERVICE};</li>		* {@link android.Manifest.permission#BIND_VPN_SERVICE};</li>
	* <li>target {@link android.os.Build.VERSION_CODES#N API 24} or above; and</li>		* <li>target {@link android.os.Build.VERSION_CODES#N API 24} or above; and</li>
	* <li><i>not</i> explicitly opt out of the feature through		* <li><i>not</i> explicitly opt out of the feature through
	* {@link android.net.VpnService#METADATA_SUPPORTS_ALWAYS_ON}.</li>		* {@link android.net.VpnService#SERVICE_META_DATA_SUPPORTS_ALWAYS_ON}.</li>
	* </ul>		* </ul>
	* The call will fail if called with the package name of an unsupported VPN app.		* The call will fail if called with the package name of an unsupported VPN app.
	*		*

core/java/android/net/ConnectivityManager.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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.