diff options
author | Irfan Sheriff <isheriff@google.com> | 2010-10-15 14:30:36 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-15 14:30:36 -0700 |
commit | 4e08a985418f581b4ca8c46316c85defd7b173cd (patch) | |
tree | 85f32c2be22c56754534d1e98e09cae74cdcb953 | |
parent | 73dbdc35d4db5a03310bec8d8d7dcb58dba0c940 (diff) | |
parent | 84510802f114e7ffafbf9869d91a74c86d2b68a6 (diff) | |
download | frameworks_base-4e08a985418f581b4ca8c46316c85defd7b173cd.zip frameworks_base-4e08a985418f581b4ca8c46316c85defd7b173cd.tar.gz frameworks_base-4e08a985418f581b4ca8c46316c85defd7b173cd.tar.bz2 |
Merge "fix build DO NOT MERGE" into gingerbread
-rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index 95e3945..8028fe7 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -1287,7 +1287,7 @@ public class WifiStateTracker extends NetworkStateTracker { */ setNumAllowedChannels(); synchronized (this) { - String macaddr = WifiNative.getMacAddressCommand(); + macaddr = WifiNative.getMacAddressCommand(); if (macaddr != null) { mWifiInfo.setMacAddress(macaddr); } |