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

Commit 04519bed authored by Lais Andrade's avatar Lais Andrade Committed by Android (Google) Code Review
Browse files

Merge "Refinements to initial RingtoneSelection." into main

parents 7ae0a12d 3fda32e1

core/api/test-current.txt

+6 −4
Original line number Diff line number Diff line
@@ -1903,7 +1903,7 @@ package android.media { 
    method public android.media.PlaybackParams setAudioStretchMode(int);

  }



  public final class RingtoneSelection {

  @FlaggedApi("android.os.vibrator.haptics_customization_enabled") public final class RingtoneSelection {

    method @NonNull public static android.media.RingtoneSelection fromUri(@Nullable android.net.Uri, int);

    method public int getSoundSource();

    method @Nullable public android.net.Uri getSoundUri();
@@ -1915,14 +1915,16 @@ package android.media { 
    field public static final int FROM_URI_RINGTONE_SELECTION_ONLY = 3; // 0x3

    field public static final int FROM_URI_RINGTONE_SELECTION_OR_SOUND = 1; // 0x1

    field public static final int FROM_URI_RINGTONE_SELECTION_OR_VIBRATION = 2; // 0x2

    field public static final int SOUND_SOURCE_DEFAULT = 0; // 0x0

    field public static final int SOUND_SOURCE_OFF = 1; // 0x1

    field public static final int SOUND_SOURCE_SYSTEM_DEFAULT = 3; // 0x3

    field public static final int SOUND_SOURCE_UNSPECIFIED = 0; // 0x0

    field public static final int SOUND_SOURCE_URI = 2; // 0x2

    field public static final int VIBRATION_SOURCE_APPLICATION_PROVIDED = 3; // 0x3

    field public static final int VIBRATION_SOURCE_APPLICATION_DEFAULT = 4; // 0x4

    field public static final int VIBRATION_SOURCE_AUDIO_CHANNEL = 10; // 0xa

    field public static final int VIBRATION_SOURCE_DEFAULT = 0; // 0x0

    field public static final int VIBRATION_SOURCE_HAPTIC_GENERATOR = 11; // 0xb

    field public static final int VIBRATION_SOURCE_OFF = 1; // 0x1

    field public static final int VIBRATION_SOURCE_SYSTEM_DEFAULT = 3; // 0x3

    field public static final int VIBRATION_SOURCE_UNSPECIFIED = 0; // 0x0

    field public static final int VIBRATION_SOURCE_URI = 2; // 0x2

  }

core/api/test-lint-baseline.txt

+10 −0
Original line number Diff line number Diff line
@@ -191,8 +191,14 @@ UnflaggedApi: android.media.RingtoneSelection#SOUND_SOURCE_DEFAULT: 
    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.SOUND_SOURCE_DEFAULT

UnflaggedApi: android.media.RingtoneSelection#SOUND_SOURCE_OFF:

    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.SOUND_SOURCE_OFF

UnflaggedApi: android.media.RingtoneSelection#SOUND_SOURCE_SYSTEM_DEFAULT:

    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.SOUND_SOURCE_SYSTEM_DEFAULT

UnflaggedApi: android.media.RingtoneSelection#SOUND_SOURCE_UNSPECIFIED:

    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.SOUND_SOURCE_UNSPECIFIED

UnflaggedApi: android.media.RingtoneSelection#SOUND_SOURCE_URI:

    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.SOUND_SOURCE_URI

UnflaggedApi: android.media.RingtoneSelection#VIBRATION_SOURCE_APPLICATION_DEFAULT:

    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.VIBRATION_SOURCE_APPLICATION_DEFAULT

UnflaggedApi: android.media.RingtoneSelection#VIBRATION_SOURCE_APPLICATION_PROVIDED:

    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.VIBRATION_SOURCE_APPLICATION_PROVIDED

UnflaggedApi: android.media.RingtoneSelection#VIBRATION_SOURCE_AUDIO_CHANNEL:
@@ -203,6 +209,10 @@ UnflaggedApi: android.media.RingtoneSelection#VIBRATION_SOURCE_HAPTIC_GENERATOR: 
    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.VIBRATION_SOURCE_HAPTIC_GENERATOR

UnflaggedApi: android.media.RingtoneSelection#VIBRATION_SOURCE_OFF:

    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.VIBRATION_SOURCE_OFF

UnflaggedApi: android.media.RingtoneSelection#VIBRATION_SOURCE_SYSTEM_DEFAULT:

    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.VIBRATION_SOURCE_SYSTEM_DEFAULT

UnflaggedApi: android.media.RingtoneSelection#VIBRATION_SOURCE_UNSPECIFIED:

    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.VIBRATION_SOURCE_UNSPECIFIED

UnflaggedApi: android.media.RingtoneSelection#VIBRATION_SOURCE_URI:

    New API must be flagged with @FlaggedApi: field android.media.RingtoneSelection.VIBRATION_SOURCE_URI

UnflaggedApi: android.media.RingtoneSelection#fromUri(android.net.Uri, int):

media/java/android/media/RingtoneSelection.java

+243 −105

File changed.

Preview size limit exceeded, changes collapsed.