Merge "audio: Volume can't adjust during HFP call when screen is off." (fc369ccc) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -3959,6 +3959,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		final boolean down = event.getAction() == KeyEvent.ACTION_DOWN;
		final boolean canceled = event.isCanceled();
		final int keyCode = event.getKeyCode();
		AudioManager audioManager = (AudioManager) mContext.getSystemService(
		Context.AUDIO_SERVICE);

		if (SystemProperties.getInt("sys.quickboot.enable", 0) == 1) {

		@@ -4092,7 +4094,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		&& (result & ACTION_PASS_TO_USER) == 0) {
		// If we are in call but we decided not to pass the key to
		// the application, handle the volume change here.
		if(audioManager.isBluetoothScoOn()) {
		handleVolumeKey(AudioManager.STREAM_BLUETOOTH_SCO, keyCode);
		} else {
		handleVolumeKey(AudioManager.STREAM_VOICE_CALL, keyCode);
		}
		break;
		}
		} catch (RemoteException ex) {