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

Commit 04e50f86 authored by lucaslin's avatar lucaslin
Browse files

Prevent SIGN_IN notification pop up several times 

SIGN_IN notification may pop up several times before user
logged in the network if someone trigger
ConnectivityService#reportNetworkConnectivity().
Add a boolean to make sure SIGN_IN notification will only pop up
once to user before user logged in.

Bug: b/122164725
Test: Build pass.
Change-Id: I9c7f1d47fde8e5dfadd6646497023b05f3b0ed88
parent f9d61f1c

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

+4 −2
Original line number Diff line number Diff line
@@ -790,6 +790,7 @@ public class NetworkMonitor extends StateMachine { 


        @Override

        public void exit() {

            mLaunchCaptivePortalAppBroadcastReceiver = null;

            hideProvisioningNotification();

        }

    }
@@ -913,9 +914,10 @@ public class NetworkMonitor extends StateMachine { 
                mLaunchCaptivePortalAppBroadcastReceiver = new CustomIntentReceiver(

                        ACTION_LAUNCH_CAPTIVE_PORTAL_APP, new Random().nextInt(),

                        CMD_LAUNCH_CAPTIVE_PORTAL_APP);

            }

                // Display the sign in notification.

                // Only do this once for every time we enter MaybeNotifyState. b/122164725

                showProvisioningNotification(mLaunchCaptivePortalAppBroadcastReceiver.mAction);

            }

            // Retest for captive portal occasionally.

            sendMessageDelayed(CMD_CAPTIVE_PORTAL_RECHECK, 0 /* no UID */,

                    CAPTIVE_PORTAL_REEVALUATE_DELAY_MS);