Merge "Let some messages get processed in emergency state" into mnc-dr-dev (089df9db) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DcSwitchStateMachine.java

+15 −1

Original line number	Diff line number	Diff line
		@@ -170,11 +170,25 @@ public class DcSwitchStateMachine extends StateMachine {
		break;
		}

		default: {
		// explicitly call out the messages we must defer
		// anything not listed falls through to the default state
		case DcSwitchAsyncChannel.REQ_CONNECT:
		case DcSwitchAsyncChannel.REQ_RETRY_CONNECT:
		case DcSwitchAsyncChannel.REQ_DISCONNECT_ALL:
		case DcSwitchAsyncChannel.EVENT_DATA_ATTACHED:
		case DcSwitchAsyncChannel.EVENT_DATA_DETACHED: {
		log("EmergencyState: deferMessage msg.what=0x" + Integer.toHexString(msg.what));
		deferMessage(msg);
		break;
		}

		default: {
		if (VDBG) {
		log("EmergencyState: nothandled msg.what=0x" +
		Integer.toHexString(msg.what));
		}
		return NOT_HANDLED;
		}
		}

		return HANDLED;