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

Commit 32c3d5fe authored by Hongguang Chen's avatar Hongguang Chen Committed by Android (Google) Code Review
Browse files

Merge "Use last volume level instead of the level specified in Intent" into main

parents 89832310 914aa177

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java

+2 −3
Original line number Diff line number Diff line
@@ -1305,13 +1305,12 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 
            if (action.equals(AudioManager.VOLUME_CHANGED_ACTION)) {

                final int stream = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE,

                        STREAM_UNKNOWN);

                final int level = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, -1);

                final int oldLevel = intent

                        .getIntExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, -1);

                if (D.BUG) Log.d(TAG, "onReceive VOLUME_CHANGED_ACTION stream=" + stream

                        + " level=" + level + " oldLevel=" + oldLevel);

                        + " oldLevel=" + oldLevel);

                if (stream != STREAM_UNKNOWN) {

                    changed = updateStreamLevelW(stream, level);

                    changed |= onVolumeChangedW(stream, 0);

                }

            } else if (action.equals(AudioManager.STREAM_DEVICES_CHANGED_ACTION)) {

                final int stream = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE,