From 24c05187233f80e2eef87f821437e3e786b1f6b4 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Thu, 5 Feb 2015 12:30:36 -0500 Subject: [PATCH] Use shared value for default muteable streams. Change-Id: Ib8fa7aee3bed83fc26945fd0caf0cbd9f4f8af3a --- media/java/android/media/AudioService.java | 13 ++++++++----- .../android/providers/settings/DatabaseHelper.java | 5 +---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index d96fee6446152..bcdde50137a05 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -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) { @@ -899,11 +905,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; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 175b4244dd168..6a05af11757b4 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -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(); }