diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-10-15 18:23:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:23:47 -0700 |
| commit | cf054d1cf605d46d3b2e459c28fe4516df104a39 (patch) | |
| tree | 1fd84d0206a23324339e912ca893a2e47233b9d3 /wifi | |
| parent | 81df9841c64e417fe2adfab0e8d694af09e07c0d (diff) | |
| parent | f8834f878fb6911cbd4719640cd2e6bf3a958a92 (diff) | |
| download | frameworks_base-cf054d1cf605d46d3b2e459c28fe4516df104a39.zip frameworks_base-cf054d1cf605d46d3b2e459c28fe4516df104a39.tar.gz frameworks_base-cf054d1cf605d46d3b2e459c28fe4516df104a39.tar.bz2 | |
am f8834f87: Merge "fetch macaddr right after supplicant connection" into gingerbread
Merge commit 'f8834f878fb6911cbd4719640cd2e6bf3a958a92' into gingerbread-plus-aosp
* commit 'f8834f878fb6911cbd4719640cd2e6bf3a958a92':
fetch macaddr right after supplicant connection
Diffstat (limited to 'wifi')
| -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 73b6ec1..fe7e122 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -841,9 +841,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(); |