Merge "Bluetooth: Check direction of Volume Change." (216b4a3a) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/hfpclient/HandsfreeClientStateMachine.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,8 @@ final class HandsfreeClientStateMachine extends StateMachine {
		private int mIndicatorCall;
		private int mIndicatorCallSetup;
		private int mIndicatorCallHeld;
		private boolean mVgsFromStack = false;
		private boolean mVgmFromStack = false;

		private String mOperatorName;
		private String mSubscriberInfo;
		@@ -1577,11 +1579,19 @@ final class HandsfreeClientStateMachine extends StateMachine {
		}
		break;
		case SET_MIC_VOLUME:
		if (mVgmFromStack) {
		mVgmFromStack = false;
		break;
		}
		if (setVolumeNative(HandsfreeClientHalConstants.VOLUME_TYPE_MIC, message.arg1)) {
		addQueuedAction(SET_MIC_VOLUME);
		}
		break;
		case SET_SPEAKER_VOLUME:
		if (mVgsFromStack) {
		mVgsFromStack = false;
		break;
		}
		if (setVolumeNative(HandsfreeClientHalConstants.VOLUME_TYPE_SPK, message.arg1)) {
		addQueuedAction(SET_SPEAKER_VOLUME);
		}
		@@ -1794,8 +1804,10 @@ final class HandsfreeClientStateMachine extends StateMachine {
		if (event.valueInt == HandsfreeClientHalConstants.VOLUME_TYPE_SPK) {
		mAudioManager.setStreamVolume(AudioManager.STREAM_BLUETOOTH_SCO,
		event.valueInt2, AudioManager.FLAG_SHOW_UI);
		mVgsFromStack = true;
		} else if (event.valueInt == HandsfreeClientHalConstants.VOLUME_TYPE_MIC) {
		mAudioManager.setMicrophoneMute(event.valueInt2 == 0);
		mVgmFromStack = true;
		}
		break;
		case EVENT_TYPE_CMD_RESULT: