commit a8e38ba111bac40e374412253fc6b6a542c7714f
author Erik Kline <ek@google.com> Tue Jun 02 15:23:07 2015 +0900
committer Erik Kline <ek@google.com> Tue Jun 02 16:03:55 2015 +0900
tree 99ee680a4547f0b3fa8989e9ef67121d8bcd1e02
parent f9d866f1b4e93593b3411886fd71e729f4a5a205

simplify processing DhcpResults LinkAddress data

Bug: 20451261
Change-Id: Ie95d430da58b94ee8b26e79442a35614cb86e78e

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 70152bb..c9cea00 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4797,24 +4797,18 @@
             loge("link address " + dhcpResults.ipAddress);
         }
 
+        Inet4Address addr;
         synchronized (mDhcpResultsLock) {
             mDhcpResults = dhcpResults;
+            addr = (Inet4Address) dhcpResults.ipAddress.getAddress();
         }
 
-        Inet4Address addr = (Inet4Address) dhcpResults.ipAddress.getAddress();
         if (isRoaming()) {
-            if (addr instanceof Inet4Address) {
-                int previousAddress = mWifiInfo.getIpAddress();
-                int newAddress = NetworkUtils.inetAddressToInt(addr);
-                if (previousAddress != newAddress) {
-                    loge("handleIPv4Success, roaming and address changed" +
-                            mWifiInfo + " got: " + addr);
-                } else {
-
-                }
-            } else {
-                loge("handleIPv4Success, roaming and didnt get an IPv4 address" +
-                        addr.toString());
+            int previousAddress = mWifiInfo.getIpAddress();
+            int newAddress = NetworkUtils.inetAddressToInt(addr);
+            if (previousAddress != newAddress) {
+                loge("handleIPv4Success, roaming and address changed" +
+                        mWifiInfo + " got: " + addr);
             }
         }
         mWifiInfo.setInetAddress(addr);