Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6f5e0d9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't send volume keys twice" into rvc-dev am: 83cdf386 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11741278

Change-Id: I48a15947b822256e68edc37fc0a72c0194fb9b64
parents 1b0d221b 83cdf386

services/core/java/com/android/server/audio/AudioService.java

+9 −4
Original line number Original line Diff line number Diff line
@@ -1893,7 +1893,7 @@ public class AudioService extends IAudioService.Stub 
                            Binder.getCallingUid(), true, keyEventMode);

                            Binder.getCallingUid(), true, keyEventMode);

                break;

                break;

            case KeyEvent.KEYCODE_VOLUME_MUTE:

            case KeyEvent.KEYCODE_VOLUME_MUTE:

                if (event.getRepeatCount() == 0) {

                if (event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() == 0) {

                    adjustSuggestedStreamVolume(AudioManager.ADJUST_TOGGLE_MUTE,

                    adjustSuggestedStreamVolume(AudioManager.ADJUST_TOGGLE_MUTE,

                            AudioManager.USE_DEFAULT_STREAM_TYPE, flags, callingPackage, caller,

                            AudioManager.USE_DEFAULT_STREAM_TYPE, flags, callingPackage, caller,

                            Binder.getCallingUid(), true, VOL_ADJUST_NORMAL);

                            Binder.getCallingUid(), true, VOL_ADJUST_NORMAL);
@@ -2155,7 +2155,8 @@ public class AudioService extends IAudioService.Stub 
        }

        }

        int oldIndex = mStreamStates[streamType].getIndex(device);

        int oldIndex = mStreamStates[streamType].getIndex(device);





        if (adjustVolume && (direction != AudioManager.ADJUST_SAME)) {

        if (adjustVolume

                && (direction != AudioManager.ADJUST_SAME) && (keyEventMode != VOL_ADJUST_END)) {

            mAudioHandler.removeMessages(MSG_UNMUTE_STREAM);

            mAudioHandler.removeMessages(MSG_UNMUTE_STREAM);





            if (isMuteAdjust) {

            if (isMuteAdjust) {
@@ -2238,6 +2239,11 @@ public class AudioService extends IAudioService.Stub 
            if (streamTypeAlias == AudioSystem.STREAM_MUSIC) {

            if (streamTypeAlias == AudioSystem.STREAM_MUSIC) {

                setSystemAudioVolume(oldIndex, newIndex, getStreamMaxVolume(streamType), flags);

                setSystemAudioVolume(oldIndex, newIndex, getStreamMaxVolume(streamType), flags);

            }

            }

        }



        final int newIndex = mStreamStates[streamType].getIndex(device);



        if (adjustVolume) {

            synchronized (mHdmiClientLock) {

            synchronized (mHdmiClientLock) {

                if (mHdmiManager != null) {

                if (mHdmiManager != null) {

                    // mHdmiCecSink true => mHdmiPlaybackClient != null

                    // mHdmiCecSink true => mHdmiPlaybackClient != null
@@ -2290,8 +2296,7 @@ public class AudioService extends IAudioService.Stub 
                }

                }

            }

            }

        }

        }

        int index = mStreamStates[streamType].getIndex(device);

        sendVolumeUpdate(streamType, oldIndex, newIndex, flags, device);

        sendVolumeUpdate(streamType, oldIndex, index, flags, device);

    }

    }





    // Called after a delay when volume down is pressed while muted

    // Called after a delay when volume down is pressed while muted