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

* commit 'dfe318d7120b8a1299dda957ad84d29171b583fb':
  Ringtone picker is not affected by current sonification policy
This commit is contained in:
Jean-Michel Trivi
2015-05-26 17:32:49 +00:00
committed by Android Git Automerger

View File

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