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

Merge "Fix dead lock in Tethering state machine"

Browse Source
This commit is contained in:
Erik Kline
2017-03-01 11:40:02 +00:00
committed by Gerrit Code Review
parent dff6c5c30d 977aad5a65
commit 355dbae680
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -950,6 +950,8 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
// Events from NetworkCallbacks that we process on the master state // Events from NetworkCallbacks that we process on the master state
// machine thread on behalf of the UpstreamNetworkMonitor. // machine thread on behalf of the UpstreamNetworkMonitor.
static final int EVENT_UPSTREAM_CALLBACK = BASE_MASTER + 5; static final int EVENT_UPSTREAM_CALLBACK = BASE_MASTER + 5;
// we treated the error and want now to clear it
static final int CMD_CLEAR_ERROR = BASE_MASTER + 6;
private State mInitialState; private State mInitialState;
private State mTetherModeAliveState; private State mTetherModeAliveState;
@@ -1496,6 +1498,10 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
TetherInterfaceStateMachine who = (TetherInterfaceStateMachine)message.obj; TetherInterfaceStateMachine who = (TetherInterfaceStateMachine)message.obj;
who.sendMessage(mErrorNotification); who.sendMessage(mErrorNotification);
break; break;
case CMD_CLEAR_ERROR:
mErrorNotification = ConnectivityManager.TETHER_ERROR_NO_ERROR;
transitionTo(mInitialState);
break;
default: default:
retValue = false; retValue = false;
} }
@@ -1640,6 +1646,12 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
// Not really very much we can do here. // Not really very much we can do here.
} }
// If TetherMasterSM is in ErrorState, TetherMasterSM stays there.
// Thus we give a chance for TetherMasterSM to recover to InitialState
// by sending CMD_CLEAR_ERROR
if (error == ConnectivityManager.TETHER_ERROR_MASTER_ERROR) {
mTetherMasterSM.sendMessage(TetherMasterSM.CMD_CLEAR_ERROR, who);
}
switch (state) { switch (state) {
case IControlsTethering.STATE_UNAVAILABLE: case IControlsTethering.STATE_UNAVAILABLE:
case IControlsTethering.STATE_AVAILABLE: case IControlsTethering.STATE_AVAILABLE:

3
services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
View File

@@ -167,7 +167,8 @@ public class TetherInterfaceStateMachine extends StateMachine {
private void maybeLogMessage(State state, int what) { private void maybeLogMessage(State state, int what) {
if (DBG) { if (DBG) {
Log.d(TAG, state.getName() + " got " + Log.d(TAG, state.getName() + " got " +
sMagicDecoderRing.get(what, Integer.toString(what))); sMagicDecoderRing.get(what, Integer.toString(what)) + ", Iface = " +
mIfaceName);
} }
} }