Add a "sign into network" button to the wifi details page.

Bug: 36203355
Test: manually signed into captive portal
Test: make -j64 RunSettingsRoboTests
Change-Id: I3242ef30125ddfdaaac9b80ead4f8ac14ea6d364

2 files changed, 53 insertions, 0 deletions

diff --git a/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java b/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java
index 9424278c9e..9e20c9d1fd 100644
--- a/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java
+++ b/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java
@@ -16,6 +16,11 @@
 
 package com.android.settings.vpn2;
 
+import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.Network;
+import android.net.NetworkRequest;
+import android.os.Handler;
 import android.net.ProxyInfo;
 
 /**
@@ -27,6 +32,11 @@ import android.net.ProxyInfo;
 public interface ConnectivityManagerWrapper {
 
     /**
+     * Returns the real ConnectivityManager object wrapped by this wrapper.
+     */
+    public ConnectivityManager getConnectivityManager();
+
+    /**
      * Calls {@code ConnectivityManager.getAlwaysOnVpnPackageForUser()}.
      *
      * @see android.net.ConnectivityManager#getAlwaysOnVpnPackageForUser
@@ -39,4 +49,27 @@ public interface ConnectivityManagerWrapper {
      * @see android.net.ConnectivityManager#getGlobalProxy
      */
    ProxyInfo getGlobalProxy();
+
+    /**
+     * Calls {@code ConnectivityManager.registerNetworkCallback()}.
+     *
+     * This is part of the ConnectivityManager public API in SDK 26 or above, but is not yet visible
+     * to the robolectric tests, which currently build with SDK 23.
+     * TODO: delete this once the robolectric tests build with SDK 26 or above.
+     *
+     * @see android.net.ConnectivityManager#registerNetworkCallback(NetworkRequest,NetworkCallback,Handler)
+     */
+    public void registerNetworkCallback(NetworkRequest request, NetworkCallback callback,
+            Handler handler);
+
+    /**
+     * Calls {@code ConnectivityManager.startCaptivePortalApp()}.
+     *
+     * This is part of the ConnectivityManager public API in SDK 26 or above, but is not yet visible
+     * to the robolectric tests, which currently build with SDK 23.
+     * TODO: delete this once the robolectric tests build with SDK 26 or above.
+     *
+     * @see android.net.ConnectivityManager#startCaptivePortalApp(Network)
+     */
+    public void startCaptivePortalApp(Network network);
 }
diff --git a/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java b/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java
index d3c17f210e..f742cd22b0 100644
--- a/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java
+++ b/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java
@@ -17,6 +17,10 @@
 package com.android.settings.vpn2;
 
 import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.Network;
+import android.net.NetworkRequest;
+import android.os.Handler;
 import android.net.ProxyInfo;
 
 public class ConnectivityManagerWrapperImpl implements ConnectivityManagerWrapper {
@@ -28,6 +32,11 @@ public class ConnectivityManagerWrapperImpl implements ConnectivityManagerWrappe
     }
 
     @Override
+    public ConnectivityManager getConnectivityManager() {
+        return mCm;
+    }
+
+    @Override
     public String getAlwaysOnVpnPackageForUser(int userId) {
         return mCm.getAlwaysOnVpnPackageForUser(userId);
     }
@@ -36,4 +45,15 @@ public class ConnectivityManagerWrapperImpl implements ConnectivityManagerWrappe
     public ProxyInfo getGlobalProxy() {
         return mCm.getGlobalProxy();
     }
+
+    @Override
+    public void registerNetworkCallback(NetworkRequest request, NetworkCallback callback,
+            Handler handler) {
+        mCm.registerNetworkCallback(request, callback, handler);
+    }
+
+    @Override
+    public void startCaptivePortalApp(Network network) {
+        mCm.startCaptivePortalApp(network);
+    }
 }