Merge "Don't let NetworkMonitor state stop user-initiated transitions." into lmp...

diff --cc services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
Simple merge

diff --cc services/core/java/com/android/server/connectivity/NetworkMonitor.java
index 78f3705,52a3e30..225097f
--- 1/services/core/java/com/android/server/connectivity/NetworkMonitor.java
--- 2/services/core/java/com/android/server/connectivity/NetworkMonitor.java
+++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
@@@ -27,8 -27,8 +27,9 @@@ import android.net.ConnectivityManager
  import android.net.Network;
  import android.net.NetworkCapabilities;
  import android.net.NetworkInfo;
 +import android.net.NetworkRequest;
  import android.net.TrafficStats;
+ import android.net.Uri;
  import android.net.wifi.WifiInfo;
  import android.net.wifi.WifiManager;
  import android.os.Handler;
@@@ -233,16 -234,18 +236,19 @@@ public class NetworkMonitor extends Sta
  
      public boolean systemReady = false;
  
-     private State mDefaultState = new DefaultState();
-     private State mOfflineState = new OfflineState();
-     private State mValidatedState = new ValidatedState();
-     private State mEvaluatingState = new EvaluatingState();
-     private State mUserPromptedState = new UserPromptedState();
-     private State mCaptivePortalState = new CaptivePortalState();
-     private State mLingeringState = new LingeringState();
+     private final State mDefaultState = new DefaultState();
+     private final State mOfflineState = new OfflineState();
+     private final State mValidatedState = new ValidatedState();
+     private final State mMaybeNotifyState = new MaybeNotifyState();
+     private final State mEvaluatingState = new EvaluatingState();
+     private final State mCaptivePortalState = new CaptivePortalState();
+     private final State mLingeringState = new LingeringState();
+ 
+     private CaptivePortalLoggedInBroadcastReceiver mCaptivePortalLoggedInBroadcastReceiver = null;
+     private String mCaptivePortalLoggedInResponseToken = null;
  
 -    public NetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo) {
 +    public NetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo,
 +            NetworkRequest defaultRequest) {
          // Add suffix indicating which NetworkMonitor we're talking about.
          super(TAG + networkAgentInfo.name());