Merge "Add a method to start the captive portal login app." am: 30f2544f0c

am: f238a96172

Change-Id: Ie42fa5148bc7fcaf5b64b767c06aba9f618c0aa7

core/java/android/net/ConnectivityManager.java

@@ -17,6 +17,7 @@ package android.net;
 
 import android.annotation.IntDef;
 import android.annotation.Nullable;
+import android.annotation.RequiresPermission;
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
 import android.annotation.SystemApi;
@@ -3467,6 +3468,22 @@ public class ConnectivityManager {
         }
     }
 
+    /**
+     * Requests that the system open the captive portal app on the specified network.
+     *
+     * @param network The network to log into.
+     *
+     * @hide
+     */
+    @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL)
+    public void startCaptivePortalApp(Network network) {
+        try {
+            mService.startCaptivePortalApp(network);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
     /**
      * It is acceptable to briefly use multipath data to provide seamless connectivity for
      * time-sensitive user-facing operations when the system default network is temporarily

core/java/android/net/IConnectivityManager.aidl

@@ -161,6 +161,7 @@ interface IConnectivityManager
 
     void setAcceptUnvalidated(in Network network, boolean accept, boolean always);
     void setAvoidUnvalidated(in Network network);
+    void startCaptivePortalApp(in Network network);
 
     int getMultipathPreference(in Network Network);