commit dfe318d7120b8a1299dda957ad84d29171b583fb
author Jean-Michel Trivi <jmtrivi@google.com> Tue May 26 17:27:06 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 26 17:27:07 2015 +0000
tree abb9d05a2bfb5515530b98ad4c2b1914357d8360
parent 7ae3520e6fb996d00e90f6cdc55cddff66f3b617
parent 02fc19ecfc3d53bd0ac811e0113534e0e2818e91

Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev

core/java/android/preference/RingtonePreference.java

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 @@
 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 @@
         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);
     }
     
     /**