summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference/RingtonePreference.java
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2015-05-21 11:45:57 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2015-05-21 11:52:41 -0700
commit02fc19ecfc3d53bd0ac811e0113534e0e2818e91 (patch)
treef2141e299a89f54c127c277cfbf06d14afb227c0 /core/java/android/preference/RingtonePreference.java
parent42697ffd42f90db1ccdd0a5bbd87f664aa38518f (diff)
downloadframeworks_base-02fc19ecfc3d53bd0ac811e0113534e0e2818e91.zip
frameworks_base-02fc19ecfc3d53bd0ac811e0113534e0e2818e91.tar.gz
frameworks_base-02fc19ecfc3d53bd0ac811e0113534e0e2818e91.tar.bz2
Ringtone picker is not affected by current sonification policy
Add the FLAG_BYPASS_INTERRUPTION_POLICY AudioAttributes flag when launching the ringtone picker so it is not affected by the current sonification policy, in order to ensure the audibility of the phone ringtone or default notification being previewed by the user. Bug 19407114 Change-Id: Ibd24e3f14e56e67f9e37576a84c97a73f5494074
Diffstat (limited to 'core/java/android/preference/RingtonePreference.java')
-rw-r--r--core/java/android/preference/RingtonePreference.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/preference/RingtonePreference.java b/core/java/android/preference/RingtonePreference.java
index 488a0c4..a76bb09 100644
--- a/core/java/android/preference/RingtonePreference.java
+++ b/core/java/android/preference/RingtonePreference.java
@@ -19,6 +19,7 @@ package android.preference;
import android.content.Context;
import android.content.Intent;
import android.content.res.TypedArray;
+import android.media.AudioAttributes;
import android.media.RingtoneManager;
import android.net.Uri;
import android.provider.Settings.System;
@@ -169,6 +170,8 @@ public class RingtonePreference extends Preference implements
ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, mShowSilent);
ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, mRingtoneType);
ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, getTitle());
+ ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS,
+ AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY);
}
/**