diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2012-10-31 14:32:53 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2012-11-09 09:46:32 -0800 |
| commit | 4717c261b2c670d5c0925e3527a864aa52db6ac0 (patch) | |
| tree | 0ee1422f9fe1bbb8cfd3fbd048c79be22628da5e /wifi/java/android/net/wifi/WifiInfo.java | |
| parent | 86e39cf6d4621accf4852caa8825402eaf210579 (diff) | |
| download | frameworks_base-4717c261b2c670d5c0925e3527a864aa52db6ac0.zip frameworks_base-4717c261b2c670d5c0925e3527a864aa52db6ac0.tar.gz frameworks_base-4717c261b2c670d5c0925e3527a864aa52db6ac0.tar.bz2 | |
Remove DhcpInfoInternal
First step in accepting a set of patches.
bug:6799630
Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
Diffstat (limited to 'wifi/java/android/net/wifi/WifiInfo.java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiInfo.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index 05db571..502d1ab 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -23,7 +23,7 @@ import android.net.NetworkUtils; import android.text.TextUtils; import java.net.InetAddress; -import java.net.Inet6Address; +import java.net.Inet4Address; import java.net.UnknownHostException; import java.util.EnumMap; @@ -231,8 +231,11 @@ public class WifiInfo implements Parcelable { } public int getIpAddress() { - if (mIpAddress == null || mIpAddress instanceof Inet6Address) return 0; - return NetworkUtils.inetAddressToInt(mIpAddress); + int result = 0; + if (mIpAddress instanceof Inet4Address) { + result = NetworkUtils.inetAddressToInt((Inet4Address)mIpAddress); + } + return result; } /** |