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

Commit 53e84b3f authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-ringtone-selection" into main 

* changes:
  Revert "Introduce RingtoneSelection for carrying ringtone preference information."
  Revert "Refinements to initial RingtoneSelection."
  Revert "Flag RingtoneSelection.Builder with FLAG_HAPTICS_CUSTOMIZATION_ENABLED"
parents 59d3875a 6ee30798

core/api/test-current.txt

+0 −35
Original line number Diff line number Diff line
@@ -2031,41 +2031,6 @@ package android.media { 
    method public android.media.PlaybackParams setAudioStretchMode(int);

  }



  @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();

    method public int getVibrationSource();

    method @Nullable public android.net.Uri getVibrationUri();

    method public static boolean isRingtoneSelectionUri(@Nullable android.net.Uri);

    method @NonNull public android.net.Uri toUri();

    field public static final String DEFAULT_SELECTION_URI_STRING = "content://media/ringtone";

    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_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_DEFAULT = 4; // 0x4

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

    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

  }



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

    ctor public RingtoneSelection.Builder();

    ctor public RingtoneSelection.Builder(@NonNull android.media.RingtoneSelection);

    method @NonNull public android.media.RingtoneSelection build();

    method @NonNull public android.media.RingtoneSelection.Builder setSoundSource(int);

    method @NonNull public android.media.RingtoneSelection.Builder setSoundSource(@NonNull android.net.Uri);

    method @NonNull public android.media.RingtoneSelection.Builder setVibrationSource(int);

    method @NonNull public android.media.RingtoneSelection.Builder setVibrationSource(@NonNull android.net.Uri);

  }



  public static final class VolumeShaper.Configuration.Builder {

    method @NonNull public android.media.VolumeShaper.Configuration.Builder setOptionFlags(int);

  }

core/api/test-lint-baseline.txt

+0 −10
Original line number Diff line number Diff line
@@ -2055,14 +2055,8 @@ 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:
@@ -2073,10 +2067,6 @@ 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):