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

Commit 82a8c48b authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Fix sound effect attenuation calculation"

parents 603b2d07 f2b0c11f

media/java/android/media/AudioService.java

+3 −3
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
    // message looper for SoundPool listener

    private Looper mSoundPoolLooper = null;

    // volume applied to sound played with playSoundEffect()

    private static int SOUND_EFFECT_VOLUME_DB;

    private static int sSoundEffectVolumeDb;

    // getActiveStreamType() will return STREAM_NOTIFICATION during this period after a notification

    // stopped

    private static final int NOTIFICATION_VOLUME_DELAY_MS = 5000;
@@ -439,7 +439,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
            "ro.config.vc_call_vol_steps",

           MAX_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL]);



        SOUND_EFFECT_VOLUME_DB = context.getResources().getInteger(

        sSoundEffectVolumeDb = context.getResources().getInteger(

                com.android.internal.R.integer.config_soundEffectVolumeDb);



        mVolumePanel = new VolumePanel(context, this);
@@ -2882,7 +2882,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
                float volFloat;

                // use default if volume is not specified by caller

                if (volume < 0) {

                    volFloat = (float)Math.pow(10, SOUND_EFFECT_VOLUME_DB/20);

                    volFloat = (float)Math.pow(10, (float)sSoundEffectVolumeDb/20);

                } else {

                    volFloat = (float) volume / 1000.0f;

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback, 
        }

        int lockSoundDefaultAttenuation = context.getResources().getInteger(

                com.android.internal.R.integer.config_lockSoundVolumeDb);

        mLockSoundVolume = (float)Math.pow(10, lockSoundDefaultAttenuation/20);

        mLockSoundVolume = (float)Math.pow(10, (float)lockSoundDefaultAttenuation/20);

        IntentFilter userFilter = new IntentFilter();

        userFilter.addAction(Intent.ACTION_USER_SWITCHED);

        userFilter.addAction(Intent.ACTION_USER_REMOVED);