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

Merge "Use shared value for default muteable streams."

Browse Source
This commit is contained in:
John Spurlock
2015-02-05 17:40:48 +00:00
committed by Android (Google) Code Review
parent 3ec5f97ac5 24c0518723
commit 951c04bf4d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/java/android/media/AudioService.java
View File

@@ -356,6 +356,12 @@ public class AudioService extends IAudioService.Stub {
"STREAM_TTS"
};
public static final int DEFAULT_MUTE_STREAMS_AFFECTED =
(1 << AudioSystem.STREAM_MUSIC) |
(1 << AudioSystem.STREAM_RING) |
(1 << AudioSystem.STREAM_NOTIFICATION) |
(1 << AudioSystem.STREAM_SYSTEM);
private final AudioSystem.ErrorCallback mAudioSystemCallback = new AudioSystem.ErrorCallback() {
public void onError(int error) {
switch (error) {
@@ -911,11 +917,8 @@ public class AudioService extends IAudioService.Stub {
}
mMuteAffectedStreams = System.getIntForUser(cr,
System.MUTE_STREAMS_AFFECTED,
((1 << AudioSystem.STREAM_MUSIC)|
(1 << AudioSystem.STREAM_RING)|
(1 << AudioSystem.STREAM_SYSTEM)),
UserHandle.USER_CURRENT);
System.MUTE_STREAMS_AFFECTED, DEFAULT_MUTE_STREAMS_AFFECTED,
UserHandle.USER_CURRENT);
boolean masterMute = System.getIntForUser(cr, System.VOLUME_MASTER_MUTE,
0, UserHandle.USER_CURRENT) == 1;

5
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -2236,10 +2236,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
ringerModeAffectedStreams);
loadSetting(stmt, Settings.System.MUTE_STREAMS_AFFECTED,
((1 << AudioManager.STREAM_MUSIC) |
(1 << AudioManager.STREAM_RING) |
(1 << AudioManager.STREAM_NOTIFICATION) |
(1 << AudioManager.STREAM_SYSTEM)));
AudioService.DEFAULT_MUTE_STREAMS_AFFECTED);
} finally {
if (stmt != null) stmt.close();
}