Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread

Browse Source 
Merge commit '4e08a985418f581b4ca8c46316c85defd7b173cd' into gingerbread-plus-aosp

* commit '4e08a985418f581b4ca8c46316c85defd7b173cd':
  fix build DO NOT MERGE
This commit is contained in:
Irfan Sheriff
2010-10-15 18:24:37 -07:00
committed by Android Git Automerger
parent e35cd5f569 4e08a98541
commit cf66f58751
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/WifiStateTracker.java
View File

@@ -1288,7 +1288,7 @@ public class WifiStateTracker extends NetworkStateTracker {
*/ */
setNumAllowedChannels(); setNumAllowedChannels();
synchronized (this) { synchronized (this) {
String macaddr = WifiNative.getMacAddressCommand(); macaddr = WifiNative.getMacAddressCommand();
if (macaddr != null) { if (macaddr != null) {
mWifiInfo.setMacAddress(macaddr); mWifiInfo.setMacAddress(macaddr);
} }