Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 am: 1ebbd0bb6b am: bb3d6e2e9c (54b1d34f) · Commits · e / os / android_frameworks_base

api/current.txt

+45 −0

Original line number	Diff line number	Diff line
		@@ -10174,6 +10174,7 @@ package android.content {
		field public static final String USB_SERVICE = "usb";
		field public static final String USER_SERVICE = "user";
		field public static final String VIBRATOR_SERVICE = "vibrator";
		field public static final String VPN_MANAGEMENT_SERVICE = "vpn_management";
		field public static final String WALLPAPER_SERVICE = "wallpaper";
		field public static final String WIFI_AWARE_SERVICE = "wifiaware";
		field public static final String WIFI_P2P_SERVICE = "wifip2p";
		@@ -29770,6 +29771,35 @@ package android.net {
		field public final int code;
		}

		public final class Ikev2VpnProfile extends android.net.PlatformVpnProfile {
		method @NonNull public java.util.List<java.lang.String> getAllowedAlgorithms();
		method public int getMaxMtu();
		method @Nullable public String getPassword();
		method @Nullable public byte[] getPresharedKey();
		method @Nullable public android.net.ProxyInfo getProxyInfo();
		method @Nullable public java.security.PrivateKey getRsaPrivateKey();
		method @NonNull public String getServerAddr();
		method @Nullable public java.security.cert.X509Certificate getServerRootCaCert();
		method @Nullable public java.security.cert.X509Certificate getUserCert();
		method @NonNull public String getUserIdentity();
		method @Nullable public String getUsername();
		method public boolean isBypassable();
		method public boolean isMetered();
		}

		public static final class Ikev2VpnProfile.Builder {
		ctor public Ikev2VpnProfile.Builder(@NonNull String, @NonNull String);
		method @NonNull public android.net.Ikev2VpnProfile build();
		method @NonNull public android.net.Ikev2VpnProfile.Builder setAllowedAlgorithms(@NonNull java.util.List<java.lang.String>);
		method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthDigitalSignature(@NonNull java.security.cert.X509Certificate, @NonNull java.security.PrivateKey, @Nullable java.security.cert.X509Certificate);
		method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthPsk(@NonNull byte[]);
		method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthUsernamePassword(@NonNull String, @NonNull String, @Nullable java.security.cert.X509Certificate);
		method @NonNull public android.net.Ikev2VpnProfile.Builder setBypassable(boolean);
		method @NonNull public android.net.Ikev2VpnProfile.Builder setMaxMtu(int);
		method @NonNull public android.net.Ikev2VpnProfile.Builder setMetered(boolean);
		method @NonNull public android.net.Ikev2VpnProfile.Builder setProxy(@Nullable android.net.ProxyInfo);
		}

		public class InetAddresses {
		method public static boolean isNumericAddress(@NonNull String);
		method @NonNull public static java.net.InetAddress parseNumericAddress(@NonNull String);
		@@ -30118,6 +30148,14 @@ package android.net {
		field public String response;
		}

		public abstract class PlatformVpnProfile {
		method public final int getType();
		method @NonNull public final String getTypeString();
		field public static final int TYPE_IKEV2_IPSEC_PSK = 7; // 0x7
		field public static final int TYPE_IKEV2_IPSEC_RSA = 8; // 0x8
		field public static final int TYPE_IKEV2_IPSEC_USER_PASS = 6; // 0x6
		}

		public final class Proxy {
		ctor public Proxy();
		method @Deprecated public static String getDefaultHost();
		@@ -30398,6 +30436,13 @@ package android.net {
		method public String sanitize(String);
		}

		public class VpnManager {
		method public void deleteProvisionedVpnProfile();
		method @Nullable public android.content.Intent provisionVpnProfile(@NonNull android.net.PlatformVpnProfile);
		method public void startProvisionedVpnProfile();
		method public void stopProvisionedVpnProfile();
		}

		public class VpnService extends android.app.Service {
		ctor public VpnService();
		method public final boolean isAlwaysOn();

core/java/android/app/SystemServiceRegistry.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,7 @@ import android.net.NetworkScoreManager;
		import android.net.NetworkWatchlistManager;
		import android.net.TestNetworkManager;
		import android.net.TetheringManager;
		import android.net.VpnManager;
		import android.net.lowpan.ILowpanManager;
		import android.net.lowpan.LowpanManager;
		import android.net.nsd.INsdManager;
		@@ -379,6 +380,15 @@ public final class SystemServiceRegistry {
		return new IpSecManager(ctx, service);
		}});

		registerService(Context.VPN_MANAGEMENT_SERVICE, VpnManager.class,
		new CachedServiceFetcher<VpnManager>() {
		@Override
		public VpnManager createService(ContextImpl ctx) throws ServiceNotFoundException {
		IBinder b = ServiceManager.getService(Context.CONNECTIVITY_SERVICE);
		IConnectivityManager service = IConnectivityManager.Stub.asInterface(b);
		return new VpnManager(ctx, service);
		}});

		registerService(Context.CONNECTIVITY_DIAGNOSTICS_SERVICE,
		ConnectivityDiagnosticsManager.class,
		new CachedServiceFetcher<ConnectivityDiagnosticsManager>() {

core/java/android/content/Context.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -3394,6 +3394,7 @@ public abstract class Context {
		CONNECTIVITY_SERVICE,
		//@hide: IP_MEMORY_STORE_SERVICE,
		IPSEC_SERVICE,
		VPN_MANAGEMENT_SERVICE,
		TEST_NETWORK_SERVICE,
		//@hide: UPDATE_LOCK_SERVICE,
		//@hide: NETWORKMANAGEMENT_SERVICE,
		@@ -3983,6 +3984,14 @@ public abstract class Context {
		*/
		public static final String IPSEC_SERVICE = "ipsec";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a {@link android.net.VpnManager} to
		* manage profiles for the platform built-in VPN.
		*
		* @see #getSystemService(String)
		*/
		public static final String VPN_MANAGEMENT_SERVICE = "vpn_management";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a {@link
		* android.net.ConnectivityDiagnosticsManager} for performing network connectivity diagnostics

core/java/android/net/Ikev2VpnProfile.java

0 → 100644

+728 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/net/LinkProperties.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,8 @@ public final class LinkProperties implements Parcelable {
		private final transient boolean mParcelSensitiveFields;

		private static final int MIN_MTU = 68;
		private static final int MIN_MTU_V6 = 1280;
		/* package-visibility - Used in other files (such as Ikev2VpnProfile) as minimum iface MTU. */
		static final int MIN_MTU_V6 = 1280;
		private static final int MAX_MTU = 10000;

		private static final int INET6_ADDR_LENGTH = 16;