Merge "Unhide APIs for user space VPN." (ac0a0d06) · Commits · e / os / android_frameworks_base

api/current.txt

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ package android {
	field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";		field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";
	field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";		field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
	field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";		field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
			field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";
	field public static final java.lang.String BIND_WALLPAPER = "android.permission.BIND_WALLPAPER";		field public static final java.lang.String BIND_WALLPAPER = "android.permission.BIND_WALLPAPER";
	field public static final java.lang.String BLUETOOTH = "android.permission.BLUETOOTH";		field public static final java.lang.String BLUETOOTH = "android.permission.BLUETOOTH";
	field public static final java.lang.String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN";		field public static final java.lang.String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN";
	@@ -11758,6 +11759,32 @@ package android.net {
	method public abstract java.lang.String sanitize(java.lang.String);		method public abstract java.lang.String sanitize(java.lang.String);
	}		}

			public class VpnService extends android.app.Service {
			ctor public VpnService();
			method public android.os.IBinder onBind(android.content.Intent);
			method public void onRevoke();
			method public static android.content.Intent prepare(android.content.Context);
			method public boolean protect(int);
			method public boolean protect(java.net.Socket);
			method public boolean protect(java.net.DatagramSocket);
			field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";
			}

			public class VpnService.Builder {
			ctor public VpnService.Builder();
			method public android.net.VpnService.Builder addAddress(java.net.InetAddress, int);
			method public android.net.VpnService.Builder addAddress(java.lang.String, int);
			method public android.net.VpnService.Builder addDnsServer(java.net.InetAddress);
			method public android.net.VpnService.Builder addDnsServer(java.lang.String);
			method public android.net.VpnService.Builder addRoute(java.net.InetAddress, int);
			method public android.net.VpnService.Builder addRoute(java.lang.String, int);
			method public android.net.VpnService.Builder addSearchDomain(java.lang.String);
			method public android.os.ParcelFileDescriptor establish();
			method public android.net.VpnService.Builder setConfigureIntent(android.app.PendingIntent);
			method public android.net.VpnService.Builder setMtu(int);
			method public android.net.VpnService.Builder setSession(java.lang.String);
			}

	}		}

	package android.net.http {		package android.net.http {

core/java/android/net/VpnService.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -101,7 +101,6 @@ import java.util.ArrayList;
	* </service></pre>		* </service></pre>
	*		*
	* @see Builder		* @see Builder
	* @hide
	*/		*/
	public class VpnService extends Service {		public class VpnService extends Service {

core/res/AndroidManifest.xml

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1117,8 +1117,7 @@
	android:protectionLevel="signature" />		android:protectionLevel="signature" />

	<!-- Must be required by an {@link android.net.VpnService},		<!-- Must be required by an {@link android.net.VpnService},
	to ensure that only the system can bind to it.		to ensure that only the system can bind to it. -->
	@hide -->
	<permission android:name="android.permission.BIND_VPN_SERVICE"		<permission android:name="android.permission.BIND_VPN_SERVICE"
	android:label="@string/permlab_bindVpnService"		android:label="@string/permlab_bindVpnService"
	android:description="@string/permdesc_bindVpnService"		android:description="@string/permdesc_bindVpnService"