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

Commit fd77afd5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd4" into oc-mr1-dev-plus-aosp

parents c4649e25 47aa3516

core/java/android/preference/SeekBarVolumizer.java

+1 −2
Original line number Diff line number Diff line
@@ -206,8 +206,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba 
                    try {

                        mRingtone.setAudioAttributes(new AudioAttributes.Builder(mRingtone

                                .getAudioAttributes())

                                .setFlags(AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY |

                                        AudioAttributes.FLAG_BYPASS_MUTE)

                                .setFlags(AudioAttributes.FLAG_BYPASS_MUTE)

                                .build());

                        mRingtone.play();

                    } catch (Throwable e) {

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

+6 −2
Original line number Diff line number Diff line
@@ -184,11 +184,15 @@ public final class PlaybackActivityMonitor 
        }

    }



    private static final int FLAGS_FOR_SILENCE_OVERRIDE =

            AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY |

            AudioAttributes.FLAG_BYPASS_MUTE;



    private void checkVolumeForPrivilegedAlarm(AudioPlaybackConfiguration apc, int event) {

        if (event == AudioPlaybackConfiguration.PLAYER_STATE_STARTED ||

                apc.getPlayerState() == AudioPlaybackConfiguration.PLAYER_STATE_STARTED) {

            if ((apc.getAudioAttributes().getAllFlags() &

                    AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0 &&

            if ((apc.getAudioAttributes().getAllFlags() & FLAGS_FOR_SILENCE_OVERRIDE)

                        == FLAGS_FOR_SILENCE_OVERRIDE  &&

                    apc.getAudioAttributes().getUsage() == AudioAttributes.USAGE_ALARM &&

                    mContext.checkPermission(android.Manifest.permission.MODIFY_PHONE_STATE,

                            apc.getClientPid(), apc.getClientUid()) ==