Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d747cbc8 authored by Wink Saville's avatar Wink Saville
Browse files

If in a mobile captive portal is detected enable fail fast. 

When captive portal checking completes pass back the result.
This is used to enable/disable failing fast for mobile. When
failing fast is enabled we don't check for data stalls and thus
won't be continually trying to do recovery operations, such as
restarting the radio.

Bug: 9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
parent 607b414d

core/java/android/bluetooth/BluetoothTetheringDataTracker.java

+5 −0
Original line number Diff line number Diff line
@@ -152,6 +152,11 @@ public class BluetoothTetheringDataTracker implements NetworkStateTracker { 
        // not implemented

    }



    @Override

    public void captivePortalCheckCompleted(boolean isCaptivePortal) {

        // not implemented

    }



    /**

     * Re-enable connectivity to a network after a {@link #teardown()}.

     */

core/java/android/net/BaseNetworkStateTracker.java

+5 −0
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ public abstract class BaseNetworkStateTracker implements NetworkStateTracker { 
        // not implemented

    }



    @Override

    public void captivePortalCheckCompleted(boolean isCaptivePortal) {

        // not implemented

    }



    @Override

    public boolean setRadio(boolean turnOn) {

        // Base tracker doesn't handle radios

core/java/android/net/CaptivePortalTracker.java

+15 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ public class CaptivePortalTracker extends StateMachine { 
                        } else {

                            if (DBG) log("Not captive network " + mNetworkInfo);

                        }

                        notifyPortalCheckCompleted(mNetworkInfo, captive);

                        if (mDeviceProvisioned) {

                            if (captive) {

                                // Setup Wizard will assist the user in connecting to a captive
@@ -300,12 +301,26 @@ public class CaptivePortalTracker extends StateMachine { 
            return;

        }

        try {

            if (DBG) log("notifyPortalCheckComplete: ni=" + info);

            mConnService.captivePortalCheckComplete(info);

        } catch(RemoteException e) {

            e.printStackTrace();

        }

    }



    private void notifyPortalCheckCompleted(NetworkInfo info, boolean isCaptivePortal) {

        if (info == null) {

            loge("notifyPortalCheckComplete on null");

            return;

        }

        try {

            if (DBG) log("notifyPortalCheckCompleted: captive=" + isCaptivePortal + " ni=" + info);

            mConnService.captivePortalCheckCompleted(info, isCaptivePortal);

        } catch(RemoteException e) {

            e.printStackTrace();

        }

    }



    private boolean isActiveNetwork(NetworkInfo info) {

        try {

            NetworkInfo active = mConnService.getActiveNetworkInfo();

core/java/android/net/ConnectivityManager.java

+19 −0
Original line number Diff line number Diff line
@@ -1282,6 +1282,25 @@ public class ConnectivityManager { 
        }

    }



    /**

     * Signal that the captive portal check on the indicated network

     * is complete and whether its a captive portal or not.

     *

     * @param info the {@link NetworkInfo} object for the networkType

     *        in question.

     * @param isCaptivePortal true/false.

     *

     * <p>This method requires the call to hold the permission

     * {@link android.Manifest.permission#CONNECTIVITY_INTERNAL}.

     * {@hide}

     */

    public void captivePortalCheckCompleted(NetworkInfo info, boolean isCaptivePortal) {

        try {

            mService.captivePortalCheckCompleted(info, isCaptivePortal);

        } catch (RemoteException e) {

        }

    }



    /**

     * Supply the backend messenger for a network tracker

     *

core/java/android/net/DummyDataStateTracker.java

+6 −0
Original line number Diff line number Diff line
@@ -120,10 +120,16 @@ public class DummyDataStateTracker implements NetworkStateTracker { 
        return true;

    }



    @Override

    public void captivePortalCheckComplete() {

        // not implemented

    }



    @Override

    public void captivePortalCheckCompleted(boolean isCaptivePortal) {

        // not implemented

    }



    /**

     * Record the detailed state of a network, and if it is a

     * change from the previous state, send a notification to