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

Commit 005b8645 authored by Adrian Roos's avatar Adrian Roos
Browse files

Revert "Refinements to initial RingtoneSelection." 

This reverts commit 3fda32e1.

Reason for revert: dead code

Bug: 301713440
Bug: 272282867
Bug: 323853450
Test: n/a
Change-Id: I019b274ada77917ad81afce1a7d81cdb408762a3
parent 31d1d237

core/api/test-current.txt

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

  }



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

  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();
@@ -1987,16 +1987,14 @@ 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_DEFAULT = 4; // 0x4

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

    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

+0 −10
Original line number Diff line number Diff line
@@ -2047,14 +2047,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:
@@ -2065,10 +2059,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):

media/java/android/media/RingtoneSelection.java

+105 −243

File changed.

Preview size limit exceeded, changes collapsed.