diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-05-21 18:50:50 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-21 18:50:51 +0000 |
commit | 52ef327175b8f2013b42e3c147476702ed5dca98 (patch) | |
tree | c79eabb6c11a6dca432d14db5b49916f4de307d0 | |
parent | fe6f4c2a791e16a617d96d7500770838e5ef69d6 (diff) | |
parent | 8f8174a58d2d8819ddd2aa68cb754712ecc1e7a5 (diff) | |
download | android_packages_providers_MediaProvider-52ef327175b8f2013b42e3c147476702ed5dca98.tar.gz android_packages_providers_MediaProvider-52ef327175b8f2013b42e3c147476702ed5dca98.tar.bz2 android_packages_providers_MediaProvider-52ef327175b8f2013b42e3c147476702ed5dca98.zip |
Merge "Add support for AudioAttributes flags in RingtonePickerActivity" into mnc-dev
-rw-r--r-- | src/com/android/providers/media/RingtonePickerActivity.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/providers/media/RingtonePickerActivity.java b/src/com/android/providers/media/RingtonePickerActivity.java index 82fe0c0f..9f17f9f0 100644 --- a/src/com/android/providers/media/RingtonePickerActivity.java +++ b/src/com/android/providers/media/RingtonePickerActivity.java @@ -19,6 +19,7 @@ package com.android.providers.media; import android.content.DialogInterface; import android.content.Intent; import android.database.Cursor; +import android.media.AudioAttributes; import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; @@ -99,6 +100,8 @@ public final class RingtonePickerActivity extends AlertActivity implements */ private Ringtone mCurrentRingtone; + private int mAttributesFlags; + /** * Keep the currently playing ringtone around when changing orientation, so that it * can be stopped later, after the activity is recreated. @@ -144,6 +147,10 @@ public final class RingtonePickerActivity extends AlertActivity implements } // Get whether to show the 'Silent' item mHasSilentItem = intent.getBooleanExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true); + // AudioAttributes flags + mAttributesFlags |= intent.getIntExtra( + RingtoneManager.EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS, + 0 /*defaultValue == no flags*/); // Give the Activity so it can do managed queries mRingtoneManager = new RingtoneManager(this); @@ -326,6 +333,12 @@ public final class RingtonePickerActivity extends AlertActivity implements } if (ringtone != null) { + if (mAttributesFlags != 0) { + ringtone.setAudioAttributes( + new AudioAttributes.Builder(ringtone.getAudioAttributes()) + .setFlags(mAttributesFlags) + .build()); + } ringtone.play(); } } |