Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-10-11 21:50:42 +00:00
committed by Android (Google) Code Review
parent c4649e252d 47aa351692
commit fd77afd548
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/preference/SeekBarVolumizer.java
View File

@@ -206,8 +206,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba
try { try {
mRingtone.setAudioAttributes(new AudioAttributes.Builder(mRingtone mRingtone.setAudioAttributes(new AudioAttributes.Builder(mRingtone
.getAudioAttributes()) .getAudioAttributes())
.setFlags(AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY | .setFlags(AudioAttributes.FLAG_BYPASS_MUTE)
AudioAttributes.FLAG_BYPASS_MUTE)
.build()); .build());
mRingtone.play(); mRingtone.play();
} catch (Throwable e) { } catch (Throwable e) {

8
services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
View File

@@ -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) { private void checkVolumeForPrivilegedAlarm(AudioPlaybackConfiguration apc, int event) {
if (event == AudioPlaybackConfiguration.PLAYER_STATE_STARTED || if (event == AudioPlaybackConfiguration.PLAYER_STATE_STARTED ||
apc.getPlayerState() == AudioPlaybackConfiguration.PLAYER_STATE_STARTED) { apc.getPlayerState() == AudioPlaybackConfiguration.PLAYER_STATE_STARTED) {
if ((apc.getAudioAttributes().getAllFlags() & if ((apc.getAudioAttributes().getAllFlags() & FLAGS_FOR_SILENCE_OVERRIDE)
AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0 && == FLAGS_FOR_SILENCE_OVERRIDE &&
apc.getAudioAttributes().getUsage() == AudioAttributes.USAGE_ALARM && apc.getAudioAttributes().getUsage() == AudioAttributes.USAGE_ALARM &&
mContext.checkPermission(android.Manifest.permission.MODIFY_PHONE_STATE, mContext.checkPermission(android.Manifest.permission.MODIFY_PHONE_STATE,
apc.getClientPid(), apc.getClientUid()) == apc.getClientPid(), apc.getClientUid()) ==