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

Commit 8c5d1376 authored by Phil Tunstall's avatar Phil Tunstall
Browse files

frameworks/base: Remove CM headset/speaker volume restore code 

- Jelly Bean already has this built in for the media volume stream, but it's
broken by having our own code in there as well.
Other audio streams will no longer have their volume levels restored, and only
media volume will be subjected to the 'safe headset volume restore' cap.

- Cleaned up the 'link notification with ringtone volume' code.

Change-Id: I06e1d159a66e2d6c09c6128c4c946d9578ea90cd
parent 78200dfd

media/java/android/media/AudioService.java

+31 −100
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
     * NOTE: do not create loops in aliases!

     * Some streams alias to different streams according to device category (phone or tablet) or

     * use case (in call s off call...).See updateStreamVolumeAlias() for more details

     *  mStreamVolumeAlias contains the default aliases for a voice capable device (phone) and

     *  STREAM_VOLUME_ALIAS contains the default aliases for a voice capable device (phone) and

     *  STREAM_VOLUME_ALIAS_NON_VOICE for a non voice capable device (tablet).*/

    private final int[] STREAM_VOLUME_ALIAS = new int[] {

        AudioSystem.STREAM_VOICE_CALL,      // STREAM_VOICE_CALL
@@ -277,28 +277,9 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
            "STREAM_TTS"

    };



    // Add separate headset and speaker volumes

    private static final String[] STREAM_VOLUME_HEADSET_SETTINGS = new String[] {

        "AudioService.SAVED_VOICE_CALL_HEADSET_VOL",

        "AudioService.SAVED_SYSTEM_HEADSET_VOL",

        "AudioService.SAVED_RING_HEADSET_VOL",

        "AudioService.SAVED_MUSIC_HEADSET_VOL",

        "AudioService.SAVED_ALARM_HEADSET_VOL",

        "AudioService.SAVED_NOTIFICATION_HEADSET_VOL",

    };



    private static final String[] STREAM_VOLUME_SPEAKER_SETTINGS = new String[] {

        "AudioService.SAVED_VOICE_CALL_SPEAKER_VOL",

        "AudioService.SAVED_SYSTEM_SPEAKER_VOL",

        "AudioService.SAVED_RING_SPEAKER_VOL",

        "AudioService.SAVED_MUSIC_SPEAKER_VOL",

        "AudioService.SAVED_ALARM_SPEAKER_VOL",

        "AudioService.SAVED_NOTIFICATION_SPEAKER_VOL",

    };

    private boolean mLinkNotificationWithVolume;



    private static final int HEADSET_VOLUME_RESTORE_CAP_VOICE_CALL = 3; // Out of 5

    private static final int HEADSET_VOLUME_RESTORE_CAP_MUSIC = 8; // Out of 15

    private static final int HEADSET_VOLUME_RESTORE_CAP_OTHER = 4; // Out of 7



    private final AudioSystem.ErrorCallback mAudioSystemCallback = new AudioSystem.ErrorCallback() {

        public void onError(int error) {
@@ -619,6 +600,13 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
            dtmfStreamAlias = AudioSystem.STREAM_VOICE_CALL;

        }

        mStreamVolumeAlias[AudioSystem.STREAM_DTMF] = dtmfStreamAlias;



        if (mLinkNotificationWithVolume) {

            mStreamVolumeAlias[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_RING;

        } else {

            mStreamVolumeAlias[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_NOTIFICATION;

        }



        if (updateVolumes) {

            mStreamStates[AudioSystem.STREAM_DTMF].setAllIndexes(mStreamStates[dtmfStreamAlias],

                                                                 false /*lastAudible*/);
@@ -676,21 +664,12 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
        } else {

            mRingerModeAffectedStreams |= (1 << AudioSystem.STREAM_MUSIC);

        }



        boolean linkNotificationWithVolume = Settings.System.getInt(mContentResolver,

                Settings.System.VOLUME_LINK_NOTIFICATION, 1) == 1;

        if (linkNotificationWithVolume) {

            STREAM_VOLUME_ALIAS[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_RING;

            STREAM_VOLUME_ALIAS_NON_VOICE[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_RING;

        } else {

            STREAM_VOLUME_ALIAS[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_NOTIFICATION;

            STREAM_VOLUME_ALIAS_NON_VOICE[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_NOTIFICATION;

        }

        updateStreamVolumeAlias(false);



        Settings.System.putInt(cr,

                Settings.System.MODE_RINGER_STREAMS_AFFECTED, mRingerModeAffectedStreams);



        mLinkNotificationWithVolume = Settings.System.getInt(cr,

                Settings.System.VOLUME_LINK_NOTIFICATION, 1) == 1;



        mMuteAffectedStreams = System.getInt(cr,

                System.MUTE_STREAMS_AFFECTED,

                ((1 << AudioSystem.STREAM_MUSIC)|(1 << AudioSystem.STREAM_RING)|(1 << AudioSystem.STREAM_SYSTEM)));
@@ -3238,17 +3217,13 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
                    setRingerModeInt(getRingerMode(), false);

                }



                boolean linkNotificationWithVolume = Settings.System.getInt(mContentResolver,

                mLinkNotificationWithVolume = Settings.System.getInt(mContentResolver,

                        Settings.System.VOLUME_LINK_NOTIFICATION, 1) == 1;

                if (linkNotificationWithVolume) {

                    STREAM_VOLUME_ALIAS[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_RING;

                    STREAM_VOLUME_ALIAS_NON_VOICE[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_RING;



                if (mLinkNotificationWithVolume) {

                    mStreamVolumeAlias[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_RING;

                } else {

                    STREAM_VOLUME_ALIAS[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_NOTIFICATION;

                    STREAM_VOLUME_ALIAS_NON_VOICE[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_NOTIFICATION;

                    mStreamVolumeAlias[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_NOTIFICATION;

                }

                updateStreamVolumeAlias(false);

            }

        }

    }
@@ -3560,73 +3535,29 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
                    }

                }

            } else if (action.equals(Intent.ACTION_HEADSET_PLUG)) {

                //Save and restore volumes for headset and speaker

                state = intent.getIntExtra("state", 0);

                int lastVolume;

                if (state == 1) {

                    //avoids connection glitches

                    if (noDelayInATwoDP)

                        setBluetoothA2dpOnInt(false);

                    // Headset plugged in

                    // Avoid connection glitches

                    if (noDelayInATwoDP) {

                        setBluetoothA2dpOnInt(false);

                    }



                    // Media volume restore capping

                    final boolean capVolumeRestore = Settings.System.getInt(mContentResolver,

                            Settings.System.SAFE_HEADSET_VOLUME_RESTORE, 1) == 1;

                    for (int stream = 0; stream < STREAM_VOLUME_HEADSET_SETTINGS.length; stream++) {

                        final int streamAlias = mStreamVolumeAlias[stream];

                        // Save speaker volume

                        System.putInt(mContentResolver, STREAM_VOLUME_SPEAKER_SETTINGS[stream],

                                getStreamVolume(streamAlias));

                        // Restore headset volume

                        try {

                            lastVolume = System.getInt(mContentResolver,

                                    STREAM_VOLUME_HEADSET_SETTINGS[streamAlias]);

                        } catch (SettingNotFoundException e) {

                            lastVolume = -1;

                        }

                        if (lastVolume >= 0) {

                    if (capVolumeRestore) {

                                final int volumeCap;

                                switch (streamAlias) {

                                    case AudioSystem.STREAM_VOICE_CALL:

                                        volumeCap = HEADSET_VOLUME_RESTORE_CAP_VOICE_CALL;

                                        break;

                                    case AudioSystem.STREAM_MUSIC:

                                        volumeCap = HEADSET_VOLUME_RESTORE_CAP_MUSIC;

                                        break;

                                    case AudioSystem.STREAM_SYSTEM:

                                    case AudioSystem.STREAM_RING:

                                    case AudioSystem.STREAM_ALARM:

                                    case AudioSystem.STREAM_NOTIFICATION:

                                    default:

                                        volumeCap = HEADSET_VOLUME_RESTORE_CAP_OTHER;

                                        break;

                                }

                                setStreamVolume(streamAlias, Math.min(volumeCap, lastVolume), 0);

                            } else {

                                setStreamVolume(streamAlias, lastVolume, 0);

                            }

                        final int volume = getStreamVolume(AudioSystem.STREAM_MUSIC);

                        if (volume > HEADSET_VOLUME_RESTORE_CAP_MUSIC) {

                            setStreamVolume(AudioSystem.STREAM_MUSIC,

                                    HEADSET_VOLUME_RESTORE_CAP_MUSIC, 0);

                        }

                    }

                } else {

                    //avoid connection glitches

                    if (noDelayInATwoDP)

                        setBluetoothA2dpOnInt(true);

                    // Headset disconnected

                    for (int stream = 0; stream < STREAM_VOLUME_SPEAKER_SETTINGS.length; stream++) {

                        final int streamAlias = mStreamVolumeAlias[stream];

                        // Save headset volume

                        System.putInt(mContentResolver, STREAM_VOLUME_HEADSET_SETTINGS[stream],

                                getStreamVolume(streamAlias));

                        // Restore speaker volume

                        try {

                            lastVolume = System.getInt(mContentResolver,

                                    STREAM_VOLUME_SPEAKER_SETTINGS[streamAlias]);

                        } catch (SettingNotFoundException e) {

                            lastVolume = -1;

                        }

                        System.putInt(mContentResolver, STREAM_VOLUME_HEADSET_SETTINGS[stream],

                                getStreamVolume(stream));

                        if (lastVolume >= 0)

                            setStreamVolume(streamAlias, lastVolume, 0);

                    // Avoid disconnection glitches

                    if (noDelayInATwoDP) {

                        setBluetoothA2dpOnInt(true);

                    }

                }

            } else if (action.equals(Intent.ACTION_USB_AUDIO_ACCESSORY_PLUG) ||