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

Commit af3aad97 authored by Simon Bowden's avatar Simon Bowden Committed by Android (Google) Code Review
Browse files

Merge "Add back the older Ringtone implementation to allow flag control." into main

parents 2a8122a0 54992072

media/java/android/media/IRingtonePlayer.aidl

+10 −2
Original line number Diff line number Diff line
@@ -30,12 +30,20 @@ interface IRingtonePlayer { 
    /** Used for Ringtone.java playback */

    @UnsupportedAppUsage

    oneway void play(IBinder token, in Uri uri, in AudioAttributes aa, float volume, boolean looping);

    oneway void stop(IBinder token);

    boolean isPlaying(IBinder token);



    // RingtoneV1

    oneway void playWithVolumeShaping(IBinder token, in Uri uri, in AudioAttributes aa,

            float volume, boolean looping, in @nullable VolumeShaper.Configuration volumeShaperConfig);

    oneway void setPlaybackProperties(IBinder token, float volume, boolean looping,

            boolean hapticGeneratorEnabled);



    // RingtoneV2

    oneway void playRemoteRingtone(IBinder token, in Uri uri, in AudioAttributes aa,

        boolean useExactAudioAttributes, int enabledMedia, in @nullable VibrationEffect ve,

        float volume, boolean looping, boolean hapticGeneratorEnabled,

        in @nullable VolumeShaper.Configuration volumeShaperConfig);

    oneway void stop(IBinder token);

    boolean isPlaying(IBinder token);

    oneway void setLooping(IBinder token, boolean looping);

    oneway void setVolume(IBinder token, float volume);

    oneway void setHapticGeneratorEnabled(IBinder token, boolean hapticGeneratorEnabled);

media/java/android/media/LocalRingtonePlayer.java

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import java.util.Objects; 
 * @hide

 */

public class LocalRingtonePlayer

        implements Ringtone.RingtonePlayer, MediaPlayer.OnCompletionListener {

        implements RingtoneV2.RingtonePlayer, MediaPlayer.OnCompletionListener {

    private static final String TAG = "LocalRingtonePlayer";



    // keep references on active Ringtones until stopped or completion listener called.
@@ -45,7 +45,7 @@ public class LocalRingtonePlayer 


    private final MediaPlayer mMediaPlayer;

    private final AudioAttributes mAudioAttributes;

    private final Ringtone.RingtonePlayer mVibrationPlayer;

    private final RingtoneV2.RingtonePlayer mVibrationPlayer;

    private final Ringtone.Injectables mInjectables;

    private final AudioManager mAudioManager;

    private final VolumeShaper mVolumeShaper;
@@ -55,7 +55,7 @@ public class LocalRingtonePlayer 
            @NonNull AudioAttributes audioAttributes, @NonNull Ringtone.Injectables injectables,

            @NonNull AudioManager audioManager, @Nullable HapticGenerator hapticGenerator,

            @Nullable VolumeShaper volumeShaper,

            @Nullable Ringtone.RingtonePlayer vibrationPlayer) {

            @Nullable RingtoneV2.RingtonePlayer vibrationPlayer) {

        Objects.requireNonNull(mediaPlayer);

        Objects.requireNonNull(audioAttributes);

        Objects.requireNonNull(injectables);
@@ -74,7 +74,7 @@ public class LocalRingtonePlayer 
     * loaded in the local player.

     */

    @Nullable

    static Ringtone.RingtonePlayer create(@NonNull Context context,

    static RingtoneV2.RingtonePlayer create(@NonNull Context context,

            @NonNull AudioManager audioManager, @NonNull Vibrator vibrator,

            @NonNull Uri soundUri,

            @NonNull AudioAttributes audioAttributes,
@@ -311,7 +311,7 @@ public class LocalRingtonePlayer 
    }



    /** A RingtonePlayer that only plays a VibrationEffect. */

    static class VibrationEffectPlayer implements Ringtone.RingtonePlayer {

    static class VibrationEffectPlayer implements RingtoneV2.RingtonePlayer {

        private static final int VIBRATION_LOOP_DELAY_MS = 200;

        private final VibrationEffect mVibrationEffect;

        private final VibrationAttributes mVibrationAttributes;