diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-10-15 13:42:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-15 13:42:38 -0700 |
| commit | f8834f878fb6911cbd4719640cd2e6bf3a958a92 (patch) | |
| tree | 751c54dc32b1986345c9e42608133635b75e72c4 | |
| parent | 2c1dab44834fb20deda9f380dae1bd7c1826b40b (diff) | |
| parent | 79f7fe2daa0dadd4e68bc94b3523edd776e43986 (diff) | |
| download | frameworks_base-f8834f878fb6911cbd4719640cd2e6bf3a958a92.zip frameworks_base-f8834f878fb6911cbd4719640cd2e6bf3a958a92.tar.gz frameworks_base-f8834f878fb6911cbd4719640cd2e6bf3a958a92.tar.bz2 | |
Merge "fetch macaddr right after supplicant connection" into gingerbread
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index 06f6696..95e3945 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -840,9 +840,15 @@ public class WifiStateTracker extends NetworkStateTracker { switch (msg.what) { case EVENT_SUPPLICANT_CONNECTION: mRunState = RUN_STATE_RUNNING; + String macaddr; synchronized (this) { updateBatteryWorkSourceLocked(null); + macaddr = WifiNative.getMacAddressCommand(); } + if (macaddr != null) { + mWifiInfo.setMacAddress(macaddr); + } + checkUseStaticIp(); /* Reset notification state on new connection */ resetNotificationTimer(); |