summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2010-10-15 14:24:23 -0700
committerIrfan Sheriff <isheriff@google.com>2010-10-15 14:27:22 -0700
commit84510802f114e7ffafbf9869d91a74c86d2b68a6 (patch)
tree41ab62dbc63c9285c8d005fc8666ee04d083d9ec /wifi
parent79f7fe2daa0dadd4e68bc94b3523edd776e43986 (diff)
downloadframeworks_base-84510802f114e7ffafbf9869d91a74c86d2b68a6.zip
frameworks_base-84510802f114e7ffafbf9869d91a74c86d2b68a6.tar.gz
frameworks_base-84510802f114e7ffafbf9869d91a74c86d2b68a6.tar.bz2
fix build DO NOT MERGE
my local change and gerritt were out of sync Change-Id: Ie581425f0290bb78b289584067b70507d82d5a57
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiStateTracker.java2
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);
}