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

Commit 71b645fe authored by Paul Jensen's avatar Paul Jensen
Browse files

Don't let NetworkMonitor state stop user-initiated transitions. 

GCM can call reportInetCondition() at any time which can cause
the NetworkMonitor to transition states to reevaluate at any time.
Previously we were only listening for users clicking the sign-in
notificaiton or completing sign-in when in the appropriate state.
With this change NetworkMonitor's state does not stop us from
listening for the user's actions.

bug:17917929
Change-Id: Ic1da31d90f7090e5fc111874cb7c37d505aaf590
parent 1ca6af34

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+27 −12
Original line number Diff line number Diff line
@@ -62,13 +62,19 @@ public class CaptivePortalLoginActivity extends Activity { 
    // Intent broadcast to ConnectivityService indicating sign-in is complete.

    // Extras:

    //     EXTRA_TEXT       = netId

    //     LOGGED_IN_RESULT = "1" if we should use network, "0" if not.

    //     LOGGED_IN_RESULT = one of the CAPTIVE_PORTAL_APP_RETURN_* values below.

    //     RESPONSE_TOKEN   = data fragment from launching Intent

    private static final String ACTION_CAPTIVE_PORTAL_LOGGED_IN =

            "android.net.netmon.captive_portal_logged_in";

    private static final String LOGGED_IN_RESULT = "result";

    private static final int CAPTIVE_PORTAL_APP_RETURN_APPEASED = 0;

    private static final int CAPTIVE_PORTAL_APP_RETURN_UNWANTED = 1;

    private static final int CAPTIVE_PORTAL_APP_RETURN_WANTED_AS_IS = 2;

    private static final String RESPONSE_TOKEN = "response_token";



    private URL mURL;

    private int mNetId;

    private String mResponseToken;

    private NetworkCallback mNetworkCallback;



    @Override
@@ -78,12 +84,18 @@ public class CaptivePortalLoginActivity extends Activity { 
        String server = Settings.Global.getString(getContentResolver(), "captive_portal_server");

        if (server == null) server = DEFAULT_SERVER;

        try {

            mURL = new URL("http://" + server + "/generate_204");

        } catch (MalformedURLException e) {

            done(true);

            mURL = new URL("http", server, "/generate_204");

            final Uri dataUri = getIntent().getData();

            if (!dataUri.getScheme().equals("netid")) {

                throw new MalformedURLException();

            }

            mNetId = Integer.parseInt(dataUri.getSchemeSpecificPart());

            mResponseToken = dataUri.getFragment();

        } catch (MalformedURLException|NumberFormatException e) {

            // System misconfigured, bail out in a way that at least provides network access.

            done(CAPTIVE_PORTAL_APP_RETURN_WANTED_AS_IS);

        }



        mNetId = Integer.parseInt(getIntent().getStringExtra(Intent.EXTRA_TEXT));

        final Network network = new Network(mNetId);

        ConnectivityManager.setProcessDefaultNetwork(network);
@@ -121,7 +133,7 @@ public class CaptivePortalLoginActivity extends Activity { 
        mNetworkCallback = new NetworkCallback() {

            @Override

            public void onLost(Network lostNetwork) {

                if (network.equals(lostNetwork)) done(false);

                if (network.equals(lostNetwork)) done(CAPTIVE_PORTAL_APP_RETURN_UNWANTED);

            }

        };

        final NetworkRequest.Builder builder = new NetworkRequest.Builder();
@@ -165,11 +177,14 @@ public class CaptivePortalLoginActivity extends Activity { 
        }

    }



    private void done(boolean use_network) {

    private void done(int result) {

        if (mNetworkCallback != null) {

            ConnectivityManager.from(this).unregisterNetworkCallback(mNetworkCallback);

        }

        Intent intent = new Intent(ACTION_CAPTIVE_PORTAL_LOGGED_IN);

        intent.putExtra(Intent.EXTRA_TEXT, String.valueOf(mNetId));

        intent.putExtra(LOGGED_IN_RESULT, use_network ? "1" : "0");

        intent.putExtra(LOGGED_IN_RESULT, String.valueOf(result));

        intent.putExtra(RESPONSE_TOKEN, mResponseToken);

        sendBroadcast(intent);

        finish();

    }
@@ -194,11 +209,11 @@ public class CaptivePortalLoginActivity extends Activity { 
    public boolean onOptionsItemSelected(MenuItem item) {

        int id = item.getItemId();

        if (id == R.id.action_use_network) {

            done(true);

            done(CAPTIVE_PORTAL_APP_RETURN_WANTED_AS_IS);

            return true;

        }

        if (id == R.id.action_do_not_use_network) {

            done(false);

            done(CAPTIVE_PORTAL_APP_RETURN_UNWANTED);

            return true;

        }

        return super.onOptionsItemSelected(item);
@@ -227,7 +242,7 @@ public class CaptivePortalLoginActivity extends Activity { 
                    if (urlConnection != null) urlConnection.disconnect();

                }

                if (httpResponseCode == 204) {

                    done(true);

                    done(CAPTIVE_PORTAL_APP_RETURN_APPEASED);

                }

            }

        }).start();

services/core/java/com/android/server/connectivity/NetworkAgentInfo.java

+10 −0
Original line number Diff line number Diff line
@@ -45,7 +45,14 @@ public class NetworkAgentInfo { 
    public NetworkCapabilities networkCapabilities;

    public final NetworkMonitor networkMonitor;

    public final NetworkMisc networkMisc;

    // Indicates if netd has been told to create this Network.  Once created the appropriate routing

    // rules are setup and routes are added so packets can begin flowing over the Network.

    // NOTE: This is a sticky bit; once set it is never cleared.

    public boolean created;

    // Set to true if this Network successfully passed validation or if it did not satisfy the

    // default NetworkRequest in which case validation will not be attempted.

    // NOTE: This is a sticky bit; once set it is never cleared even if future validation attempts

    // fail.

    public boolean validated;



    // This represents the last score received from the NetworkAgent.
@@ -58,6 +65,9 @@ public class NetworkAgentInfo { 


    // The list of NetworkRequests being satisfied by this Network.

    public final SparseArray<NetworkRequest> networkRequests = new SparseArray<NetworkRequest>();

    // The list of NetworkRequests that this Network previously satisfied with the highest

    // score.  A non-empty list indicates that if this Network was validated it is lingered.

    // NOTE: This list is only used for debugging.

    public final ArrayList<NetworkRequest> networkLingered = new ArrayList<NetworkRequest>();



    public final Messenger messenger;

services/core/java/com/android/server/connectivity/NetworkMonitor.java

+143 −125

File changed.

Preview size limit exceeded, changes collapsed.