Merge "Add API for NetworkStack to start captive portal" am: ca551ce981 (b6a6843c) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -3075,6 +3075,7 @@ package android.net {
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void getLatestTetheringEntitlementValue(int, boolean, @NonNull android.net.ConnectivityManager.TetheringEntitlementValueListener, @Nullable android.os.Handler);
		method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public boolean isTetheringSupported();
		method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void setAirplaneMode(boolean);
		method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(android.os.Bundle);
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback, android.os.Handler);
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void stopTethering(int);

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -608,6 +608,7 @@ package android.net {
		}

		public class ConnectivityManager {
		method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(android.os.Bundle);
		field public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC = "android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC";
		field public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT = "android.net.extra.CAPTIVE_PORTAL_USER_AGENT";
		}

core/java/android/net/ConnectivityManager.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -3906,6 +3906,25 @@ public class ConnectivityManager {
		}
		}

		/**
		* Requests that the system open the captive portal app with the specified extras.
		*
		* <p>This endpoint is exclusively for use by the NetworkStack and is protected by the
		* corresponding permission.
		* @param appExtras Extras to include in the app start intent.
		* @hide
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK)
		public void startCaptivePortalApp(Bundle appExtras) {
		try {
		mService.startCaptivePortalAppInternal(appExtras);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Determine whether the device is configured to avoid bad wifi.
		* @hide

core/java/android/net/IConnectivityManager.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.net.NetworkQuotaInfo;
		import android.net.NetworkRequest;
		import android.net.NetworkState;
		import android.net.ProxyInfo;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.os.Messenger;
		import android.os.ParcelFileDescriptor;
		@@ -167,6 +168,7 @@ interface IConnectivityManager
		void setAcceptUnvalidated(in Network network, boolean accept, boolean always);
		void setAvoidUnvalidated(in Network network);
		void startCaptivePortalApp(in Network network);
		void startCaptivePortalAppInternal(in Bundle appExtras);

		boolean getAvoidBadWifi();
		int getMultipathPreference(in Network Network);

packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java

+9 −10

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ import android.net.util.SharedLog;
		import android.net.util.Stopwatch;
		import android.net.wifi.WifiInfo;
		import android.net.wifi.WifiManager;
		import android.os.Bundle;
		import android.os.Message;
		import android.os.RemoteException;
		import android.os.SystemClock;
		@@ -674,11 +675,11 @@ public class NetworkMonitor extends StateMachine {
		public boolean processMessage(Message message) {
		switch (message.what) {
		case CMD_LAUNCH_CAPTIVE_PORTAL_APP:
		final Intent intent = new Intent(
		ConnectivityManager.ACTION_CAPTIVE_PORTAL_SIGN_IN);
		final Bundle appExtras = new Bundle();
		// OneAddressPerFamilyNetwork is not parcelable across processes.
		intent.putExtra(ConnectivityManager.EXTRA_NETWORK, new Network(mNetwork));
		intent.putExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL,
		appExtras.putParcelable(
		ConnectivityManager.EXTRA_NETWORK, new Network(mNetwork));
		appExtras.putParcelable(ConnectivityManager.EXTRA_CAPTIVE_PORTAL,
		new CaptivePortal(new ICaptivePortal.Stub() {
		@Override
		public void appResponse(int response) {
		@@ -700,16 +701,14 @@ public class NetworkMonitor extends StateMachine {
		}
		}));
		final CaptivePortalProbeResult probeRes = mLastPortalProbeResult;
		intent.putExtra(EXTRA_CAPTIVE_PORTAL_URL, probeRes.detectUrl);
		appExtras.putString(EXTRA_CAPTIVE_PORTAL_URL, probeRes.detectUrl);
		if (probeRes.probeSpec != null) {
		final String encodedSpec = probeRes.probeSpec.getEncodedSpec();
		intent.putExtra(EXTRA_CAPTIVE_PORTAL_PROBE_SPEC, encodedSpec);
		appExtras.putString(EXTRA_CAPTIVE_PORTAL_PROBE_SPEC, encodedSpec);
		}
		intent.putExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL_USER_AGENT,
		appExtras.putString(ConnectivityManager.EXTRA_CAPTIVE_PORTAL_USER_AGENT,
		mCaptivePortalUserAgent);
		intent.setFlags(
		Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT \| Intent.FLAG_ACTIVITY_NEW_TASK);
		mContext.startActivityAsUser(intent, UserHandle.CURRENT);
		mCm.startCaptivePortalApp(appExtras);
		return HANDLED;
		default:
		return NOT_HANDLED;