Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2494bc27 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 3fc9254b: am ea05f0a2: am 59845bef: Merge "Extra for ACTION_RINGTONE_PICKER... 

am 3fc9254b: am ea05f0a2: am 59845bef: Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev

* commit '3fc9254b':
  Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags
parents 0ff8de1b 3fc9254b

media/java/android/media/RingtoneManager.java

+12 −3
Original line number Original line Diff line number Diff line
@@ -159,6 +159,15 @@ public class RingtoneManager { 
     */

     */

    public static final String EXTRA_RINGTONE_TITLE = "android.intent.extra.ringtone.TITLE";

    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}.

     * Returned from the ringtone picker as a {@link Uri}.

     * <p>

     * <p>