Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf054d1c authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am f8834f87: Merge "fetch macaddr right after supplicant connection" into gingerbread

Merge commit 'f8834f87' into gingerbread-plus-aosp

* commit 'f8834f87':
  fetch macaddr right after supplicant connection
parents 81df9841 f8834f87
Loading
Loading
Loading
Loading
+6 −0
Original line number Original line Diff line number Diff line
@@ -841,9 +841,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();