Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev (209175a2) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/CallAudioRouteStateMachine.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -782,24 +782,30 @@ public class CallAudioRouteStateMachine extends StateMachine {
		return HANDLED;
		}
		switch(msg.what) {
		case SWITCH_EARPIECE:
		case USER_SWITCH_EARPIECE:
		mWasOnSpeaker = false;
		// fall through
		case SWITCH_EARPIECE:
		if ((mAvailableRoutes & ROUTE_EARPIECE) != 0) {
		transitionTo(mActiveEarpieceRoute);
		} else {
		Log.w(this, "Ignoring switch to earpiece command. Not available.");
		}
		return HANDLED;
		case SWITCH_BLUETOOTH:
		case USER_SWITCH_BLUETOOTH:
		mWasOnSpeaker = false;
		// fall through
		case SWITCH_BLUETOOTH:
		if ((mAvailableRoutes & ROUTE_BLUETOOTH) != 0) {
		transitionTo(mActiveBluetoothRoute);
		} else {
		Log.w(this, "Ignoring switch to bluetooth command. Not available.");
		}
		return HANDLED;
		case SWITCH_HEADSET:
		case USER_SWITCH_HEADSET:
		mWasOnSpeaker = false;
		// fall through
		case SWITCH_HEADSET:
		if ((mAvailableRoutes & ROUTE_WIRED_HEADSET) != 0) {
		transitionTo(mActiveHeadsetRoute);
		} else {