commit 0097d1ab03477fc5c7bd76a340a938671664854b
author Lorenzo Colitti <lorenzo@google.com> Mon Apr 08 05:26:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 08 05:26:00 2019 -0700
tree 10ed0aaf34a403a01182225dfcde96280b4c30b7
parent 1a80880ac925beb28ac788f43266e94ab1dcd9c8
parent ad858476665b2932c3b0987484949016fa716abe

Merge "Prevent SIGN_IN notification pop up several times" into qt-dev am: 462864489a
am: ad85847666

Change-Id: If49dd9847e1d1c5ee83985a3d5ea67cab5fb4a5e

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

diff --git a/packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java b/packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java
index 6f31f9b..8f7d988 100644
--- a/packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java
+++ b/packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java
@@ -779,6 +779,7 @@
 
         @Override
         public void exit() {
+            mLaunchCaptivePortalAppBroadcastReceiver = null;
             hideProvisioningNotification();
         }
     }
@@ -902,9 +903,10 @@
                 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);
             }
-            // Display the sign in notification.
-            showProvisioningNotification(mLaunchCaptivePortalAppBroadcastReceiver.mAction);
             // Retest for captive portal occasionally.
             sendMessageDelayed(CMD_CAPTIVE_PORTAL_RECHECK, 0 /* no UID */,
                     CAPTIVE_PORTAL_REEVALUATE_DELAY_MS);