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

Commit b846b6d5 authored by Adrian Roos's avatar Adrian Roos
Browse files

Revert "Add a flag to enable RingtoneV2" 

This reverts commit 6065db36.

Change-Id: I0f4161a9a37c09b912838e31d7be87ce6f0ef68d
Bug: 323853450
parent 8652ad6e

core/java/android/os/vibrator/flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -14,13 +14,6 @@ flag { 
    bug: "241918098"

}



flag {

    namespace: "haptics"

    name: "haptics_customization_ringtone_v2_enabled"

    description: "Enables the usage of the new RingtoneV2 class"

    bug: "241918098"

}



flag {

    namespace: "haptics"

    name: "enable_vibration_serialization_apis"

media/java/android/media/Ringtone.java

+12 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.database.Cursor; 
import android.media.audiofx.HapticGenerator;

import android.net.Uri;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.VibrationEffect;

import android.os.Vibrator;
@@ -766,4 +767,15 @@ public class Ringtone { 
        @RingtoneMedia int getEnabledMedia();

        VibrationEffect getVibrationEffect();

    }



    /**

     * Switch for using the new ringtone implementation (RingtoneV1 vs RingtoneV2). This may be

     * called from both system server and app-side sdk.

     *

     * @hide

     */

    public static boolean useRingtoneV2() {

        // TODO(b/293846645): chang eto new flagging infra

        return SystemProperties.getBoolean("persist.audio.ringtone.use_v2", false);

    }

}

media/java/android/media/RingtoneManager.java

+3 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.os.FileUtils; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.vibrator.Flags;

import android.os.vibrator.persistence.VibrationXmlParser;

import android.provider.BaseColumns;

import android.provider.MediaStore;
@@ -608,7 +607,7 @@ public class RingtoneManager { 


        Ringtone ringtone;

        Uri positionUri = getRingtoneUri(position);

        if (Flags.hapticsCustomizationRingtoneV2Enabled()) {

        if (Ringtone.useRingtoneV2()) {

            mPreviousRingtone = new Ringtone.Builder(

                    mContext, mMediaType, getDefaultAudioAttributes(mType))

                    .setUri(positionUri)
@@ -954,7 +953,7 @@ public class RingtoneManager { 
     * @return A {@link Ringtone} for the given URI, or null.

     */

    public static Ringtone getRingtone(final Context context, Uri ringtoneUri) {

        if (Flags.hapticsCustomizationRingtoneV2Enabled()) {

        if (Ringtone.useRingtoneV2()) {

            return new Ringtone.Builder(

                    context, Ringtone.MEDIA_SOUND, getDefaultAudioAttributes(-1))

                    .setUri(ringtoneUri)
@@ -971,7 +970,7 @@ public class RingtoneManager { 
            @Nullable VolumeShaper.Configuration volumeShaperConfig,

            AudioAttributes audioAttributes) {

        // TODO: move caller(s) away from this method: inline the builder call.

        if (Flags.hapticsCustomizationRingtoneV2Enabled()) {

        if (Ringtone.useRingtoneV2()) {

            return new Ringtone.Builder(context, Ringtone.MEDIA_SOUND, audioAttributes)

                    .setUri(ringtoneUri)

                    .setVolumeShaperConfig(volumeShaperConfig)

packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.UserHandle;

import android.os.VibrationEffect;

import android.os.vibrator.Flags;

import android.provider.MediaStore;

import android.util.Log;
@@ -112,7 +111,7 @@ public class RingtonePlayer implements CoreStartable { 
        @Override

        public void play(IBinder token, Uri uri, AudioAttributes aa, float volume, boolean looping)

                throws RemoteException {

            if (Flags.hapticsCustomizationRingtoneV2Enabled()) {

            if (Ringtone.useRingtoneV2()) {

                playRemoteRingtone(token, uri, aa, true, Ringtone.MEDIA_SOUND,

                        null, volume, looping, /* hapticGenerator= */ false,

                        null);