commit ecfffce5bd216571c207978944fbbcd9c17b6382
author Robert Greenwalt <rgreenwalt@google.com> Mon Jul 14 15:40:18 2014 -0700
committer The Android Automerger <android-build@google.com> Tue Jul 15 17:11:37 2014 -0700
tree 2afee96ab440073f482f94630a3968620c133290
parent 11643de951b56a83f7dd843142dd54dac8ef26d1

Fix 2.4/5 wifi roaming.

The redesign of wifi ip address optaining assumed we would never
go from have-ip -> have-ip, ie we must lose our ip config before we can
gain an ip config.  Unfortunately at least one condition does just this:
  Our inter-band roaming
To leave OBTAINING_IP_ADDRESS we need to tweak the code to generate
the success signal even if the new address is the same.

bug:16269674
Change-Id: I340b24839565fa62fd3c7d9d373695d1d4007412

service/java/com/android/server/wifi/WifiStateMachine.java

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 6f7ad27..a75002a 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -2942,31 +2942,34 @@
             }
         }
 
-        if (!newLp.equals(mLinkProperties)) {
+        final boolean linkChanged = !newLp.equals(mLinkProperties);
+        final boolean wasProvisioned = mLinkProperties.isProvisioned();
+        final boolean isProvisioned = newLp.isProvisioned();
+        final DetailedState detailedState = getNetworkDetailedState();
+
+        if (linkChanged) {
             if (DBG) {
                 log("Link configuration changed for netId: " + mLastNetworkId
                         + " old: " + mLinkProperties + "new: " + newLp);
             }
-
-            boolean wasProvisioned = mLinkProperties.isProvisioned();
-            boolean isProvisioned = newLp.isProvisioned();
-
             mLinkProperties = newLp;
             if (mNetworkAgent != null) mNetworkAgent.sendLinkProperties(mLinkProperties);
+        }
 
-            // If we just configured or lost IP configuration, do the needful.
-            // We don't just call handleSuccessfulIpConfiguration() or handleIpConfigurationLost()
-            // here because those should only be called if we're attempting to connect or already
-            // connected, whereas updateLinkProperties can be called at any time.
-            if (!wasProvisioned && isProvisioned) {
-                sendMessage(CMD_IP_CONFIGURATION_SUCCESSFUL);
-            } else if (wasProvisioned && !isProvisioned) {
-                sendMessage(CMD_IP_CONFIGURATION_LOST);
-            } else if (getNetworkDetailedState() == DetailedState.CONNECTED) {
-                // If anything has changed, and we're already connected, send out a notification.
-                sendLinkConfigurationChangedBroadcast();
-            }
-
+        // If we just configured or lost IP configuration, do the needful.
+        // We don't just call handleSuccessfulIpConfiguration() or handleIpConfigurationLost()
+        // here because those should only be called if we're attempting to connect or already
+        // connected, whereas updateLinkProperties can be called at any time.
+        // Also, when roaming we don't pass through a not-provisioned state but
+        // still need to realize we have an IP_CONFIGURATION_SUCCESSFUL.
+        if (isProvisioned &&
+                (!wasProvisioned || detailedState == DetailedState.OBTAINING_IPADDR)) {
+            sendMessage(CMD_IP_CONFIGURATION_SUCCESSFUL);
+        } else if (wasProvisioned && !isProvisioned) {
+            sendMessage(CMD_IP_CONFIGURATION_LOST);
+        } else if (linkChanged && getNetworkDetailedState() == DetailedState.CONNECTED) {
+            // If anything has changed, and we're already connected, send out a notification.
+            sendLinkConfigurationChangedBroadcast();
         }
     }