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

Commit e443db6e authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Add streamType check for intent extras" into main

parents 329e3248 6c104869

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

+18 −7
Original line number Original line Diff line number Diff line
@@ -1280,6 +1280,8 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 




    private final class Receiver extends BroadcastReceiver {

    private final class Receiver extends BroadcastReceiver {





        private static final int STREAM_UNKNOWN = -1;



        public void init() {

        public void init() {

            final IntentFilter filter = new IntentFilter();

            final IntentFilter filter = new IntentFilter();

            filter.addAction(AudioManager.VOLUME_CHANGED_ACTION);

            filter.addAction(AudioManager.VOLUME_CHANGED_ACTION);
@@ -1301,30 +1303,39 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 
            final String action = intent.getAction();

            final String action = intent.getAction();

            boolean changed = false;

            boolean changed = false;

            if (action.equals(AudioManager.VOLUME_CHANGED_ACTION)) {

            if (action.equals(AudioManager.VOLUME_CHANGED_ACTION)) {

                final int stream = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1);

                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 level = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, -1);

                final int oldLevel = intent

                final int oldLevel = intent

                        .getIntExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, -1);

                        .getIntExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, -1);

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

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

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

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

                if (stream != STREAM_UNKNOWN) {

                    changed = updateStreamLevelW(stream, level);

                    changed = updateStreamLevelW(stream, level);

                }

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

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

                final int stream = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1);

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

                        STREAM_UNKNOWN);

                final int devices = intent

                final int devices = intent

                        .getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_DEVICES, -1);

                        .getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_DEVICES, -1);

                final int oldDevices = intent

                final int oldDevices = intent

                        .getIntExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_DEVICES, -1);

                        .getIntExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_DEVICES, -1);

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

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

                        + stream + " devices=" + devices + " oldDevices=" + oldDevices);

                        + stream + " devices=" + devices + " oldDevices=" + oldDevices);

                changed = checkRoutedToBluetoothW(stream);

                if (stream != STREAM_UNKNOWN) {

                    changed |= checkRoutedToBluetoothW(stream);

                    changed |= onVolumeChangedW(stream, 0);

                    changed |= onVolumeChangedW(stream, 0);

                }

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

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

                final int stream = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1);

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

                        STREAM_UNKNOWN);

                final boolean muted = intent

                final boolean muted = intent

                        .getBooleanExtra(AudioManager.EXTRA_STREAM_VOLUME_MUTED, false);

                        .getBooleanExtra(AudioManager.EXTRA_STREAM_VOLUME_MUTED, false);

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

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

                        + " muted=" + muted);

                        + " muted=" + muted);

                if (stream != STREAM_UNKNOWN) {

                    changed = updateStreamMuteW(stream, muted);

                    changed = updateStreamMuteW(stream, muted);

                }

            } else if (action.equals(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED)) {

            } else if (action.equals(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED)) {

                if (D.BUG) Log.d(TAG, "onReceive ACTION_EFFECTS_SUPPRESSOR_CHANGED");

                if (D.BUG) Log.d(TAG, "onReceive ACTION_EFFECTS_SUPPRESSOR_CHANGED");

                changed = updateEffectsSuppressorW(mNoMan.getEffectsSuppressor());

                changed = updateEffectsSuppressorW(mNoMan.getEffectsSuppressor());