diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-10-15 18:24:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:24:37 -0700 |
| commit | cf66f587514a935c290c8c9558243a48ba0243eb (patch) | |
| tree | d883140f6d71ea6e4556a467b938b6c55d687e82 /wifi | |
| parent | e35cd5f569fe760385198f485e4610ad13033dd3 (diff) | |
| parent | 4e08a985418f581b4ca8c46316c85defd7b173cd (diff) | |
| download | frameworks_base-cf66f587514a935c290c8c9558243a48ba0243eb.zip frameworks_base-cf66f587514a935c290c8c9558243a48ba0243eb.tar.gz frameworks_base-cf66f587514a935c290c8c9558243a48ba0243eb.tar.bz2 | |
am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread
Merge commit '4e08a985418f581b4ca8c46316c85defd7b173cd' into gingerbread-plus-aosp
* commit '4e08a985418f581b4ca8c46316c85defd7b173cd':
fix build DO NOT MERGE
Diffstat (limited to 'wifi')
| -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 fe7e122..bcbd07c 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -1288,7 +1288,7 @@ public class WifiStateTracker extends NetworkStateTracker { */ setNumAllowedChannels(); synchronized (this) { - String macaddr = WifiNative.getMacAddressCommand(); + macaddr = WifiNative.getMacAddressCommand(); if (macaddr != null) { mWifiInfo.setMacAddress(macaddr); } |