summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2015-05-20 19:14:45 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2015-05-20 19:14:45 -0700
commit42697ffd42f90db1ccdd0a5bbd87f664aa38518f (patch)
tree788e429ea25381060373ab363968bd82d334caed /media
parentd3969546a8bc4efe1e5e8a72bee07105055d18c2 (diff)
downloadframeworks_base-42697ffd42f90db1ccdd0a5bbd87f664aa38518f.zip
frameworks_base-42697ffd42f90db1ccdd0a5bbd87f664aa38518f.tar.gz
frameworks_base-42697ffd42f90db1ccdd0a5bbd87f664aa38518f.tar.bz2
Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags
Add EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS to allow specifying AudioAttributes flags that will be used when playing the Ringtone. Bug 19407114 Change-Id: I56a77d7308b21afc0766356e1b6a2d76dca21221
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/RingtoneManager.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index e211b99..a1b8a3b 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -158,7 +158,16 @@ public class RingtoneManager {
* in most cases.
*/
public static final String EXTRA_RINGTONE_TITLE = "android.intent.extra.ringtone.TITLE";
-
+
+ /**
+ * @hide
+ * Given to the ringtone picker as an int. Additional AudioAttributes flags to use
+ * when playing the ringtone in the picker.
+ * @see #ACTION_RINGTONE_PICKER
+ */
+ public static final String EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS =
+ "android.intent.extra.ringtone.AUDIO_ATTRIBUTES_FLAGS";
+
/**
* Returned from the ringtone picker as a {@link Uri}.
* <p>
@@ -221,7 +230,7 @@ public class RingtoneManager {
private boolean mStopPreviousRingtone = true;
private Ringtone mPreviousRingtone;
-
+
/**
* Constructs a RingtoneManager. This constructor is recommended as its
* constructed instance manages cursor(s).
@@ -283,7 +292,7 @@ public class RingtoneManager {
return AudioManager.STREAM_RING;
}
}
-
+
/**
* Whether retrieving another {@link Ringtone} will stop playing the
* previously retrieved {@link Ringtone}.