Merge "fetch macaddr right after supplicant connection" into gingerbread

This commit is contained in:
Irfan Sheriff
2010-10-15 13:42:38 -07:00
committed by Android (Google) Code Review

View File

@@ -840,9 +840,15 @@ public class WifiStateTracker extends NetworkStateTracker {
switch (msg.what) { switch (msg.what) {
case EVENT_SUPPLICANT_CONNECTION: case EVENT_SUPPLICANT_CONNECTION:
mRunState = RUN_STATE_RUNNING; mRunState = RUN_STATE_RUNNING;
String macaddr;
synchronized (this) { synchronized (this) {
updateBatteryWorkSourceLocked(null); updateBatteryWorkSourceLocked(null);
macaddr = WifiNative.getMacAddressCommand();
} }
if (macaddr != null) {
mWifiInfo.setMacAddress(macaddr);
}
checkUseStaticIp(); checkUseStaticIp();
/* Reset notification state on new connection */ /* Reset notification state on new connection */
resetNotificationTimer(); resetNotificationTimer();