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

Merge "Fix interface notification race"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-07-24 17:14:12 -07:00
committed by Android (Google) Code Review
parent e432a00051 e8daf2a700
commit 17b8451019
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wifi/java/android/net/wifi/WifiStateMachine.java
View File

@@ -1059,7 +1059,7 @@ public class WifiStateMachine extends StateMachine {
}
}
private void startTethering(ArrayList<String> available) {
private boolean startTethering(ArrayList<String> available) {
boolean wifiAvailable = false;
@@ -1085,18 +1085,20 @@ public class WifiStateMachine extends StateMachine {
} catch (Exception e) {
Log.e(TAG, "Error configuring interface " + intf + ", :" + e);
setWifiApEnabled(null, false);
return;
return false;
}
if(mCm.tether(intf) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {
Log.e(TAG, "Error tethering on " + intf);
setWifiApEnabled(null, false);
return;
return false;
}
break;
return true;
}
}
}
// We found no interfaces to tether
return false;
}
private void stopTethering() {
@@ -3098,8 +3100,9 @@ public class WifiStateMachine extends StateMachine {
break;
case CMD_TETHER_INTERFACE:
ArrayList<String> available = (ArrayList<String>) message.obj;
startTethering(available);
transitionTo(mTetheredState);
if (startTethering(available)) {
transitionTo(mTetheredState);
}
break;
case WifiP2pService.P2P_ENABLE_PENDING:
// turn of soft Ap and defer to be handled in DriverUnloadedState