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

Commit e7eef125 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix to allow setting URI without recreating ringtone" into tm-qpr-dev am: 6170285a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19867851



Change-Id: I20a2b0e8e77d32ea90ec833990adb0589d61da71
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6a164b7 6170285a

media/java/android/media/Ringtone.java

+73 −37
Original line number Diff line number Diff line
@@ -29,11 +29,12 @@ import android.net.Uri; 
import android.os.Binder;

import android.os.Build;

import android.os.RemoteException;

import android.os.Trace;

import android.provider.MediaStore;

import android.provider.MediaStore.MediaColumns;

import android.provider.Settings;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;

import java.io.IOException;

import java.util.ArrayList;
@@ -136,13 +137,73 @@ public class Ringtone { 
     */

    public void setAudioAttributes(AudioAttributes attributes)

            throws IllegalArgumentException {

        setAudioAttributesField(attributes);

        // The audio attributes have to be set before the media player is prepared.

        // Re-initialize it.

        setUri(mUri, mVolumeShaperConfig);

        createLocalMediaPlayer();

    }



    /**

     * Same as {@link #setAudioAttributes(AudioAttributes)} except this one does not create

     * the media player.

     * @hide

     */

    public void setAudioAttributesField(@Nullable AudioAttributes attributes) {

        if (attributes == null) {

            throw new IllegalArgumentException("Invalid null AudioAttributes for Ringtone");

        }

        mAudioAttributes = attributes;

        // The audio attributes have to be set before the media player is prepared.

        // Re-initialize it.

        setUri(mUri, mVolumeShaperConfig);

    }



    /**

     * Creates a local media player for the ringtone using currently set attributes.

     * @hide

     */

    public void createLocalMediaPlayer() {

        Trace.beginSection("createLocalMediaPlayer");

        if (mUri == null) {

            Log.e(TAG, "Could not create media player as no URI was provided.");

            return;

        }

        destroyLocalPlayer();

        // try opening uri locally before delegating to remote player

        mLocalPlayer = new MediaPlayer();

        try {

            mLocalPlayer.setDataSource(mContext, mUri);

            mLocalPlayer.setAudioAttributes(mAudioAttributes);

            synchronized (mPlaybackSettingsLock) {

                applyPlaybackProperties_sync();

            }

            if (mVolumeShaperConfig != null) {

                mVolumeShaper = mLocalPlayer.createVolumeShaper(mVolumeShaperConfig);

            }

            mLocalPlayer.prepare();



        } catch (SecurityException | IOException e) {

            destroyLocalPlayer();

            if (!mAllowRemote) {

                Log.w(TAG, "Remote playback not allowed: " + e);

            }

        }



        if (LOGD) {

            if (mLocalPlayer != null) {

                Log.d(TAG, "Successfully created local player");

            } else {

                Log.d(TAG, "Problem opening; delegating to remote player");

            }

        }

        Trace.endSection();

    }



    /**

     * Returns whether a local player has been created for this ringtone.

     * @hide

     */

    @VisibleForTesting

    public boolean hasLocalPlayer() {

        return mLocalPlayer != null;

    }



    /**
@@ -336,8 +397,7 @@ public class Ringtone { 
    }



    /**

     * Set {@link Uri} to be used for ringtone playback. Attempts to open

     * locally, otherwise will delegate playback to remote

     * Set {@link Uri} to be used for ringtone playback.

     * {@link IRingtonePlayer}.

     *

     * @hide
@@ -347,6 +407,13 @@ public class Ringtone { 
        setUri(uri, null);

    }



    /**

     * @hide

     */

    public void setVolumeShaperConfig(@Nullable VolumeShaper.Configuration volumeShaperConfig) {

        mVolumeShaperConfig = volumeShaperConfig;

    }



    /**

     * Set {@link Uri} to be used for ringtone playback. Attempts to open

     * locally, otherwise will delegate playback to remote
@@ -356,41 +423,10 @@ public class Ringtone { 
     */

    public void setUri(Uri uri, @Nullable VolumeShaper.Configuration volumeShaperConfig) {

        mVolumeShaperConfig = volumeShaperConfig;

        destroyLocalPlayer();



        mUri = uri;

        if (mUri == null) {

            return;

        }



        // TODO: detect READ_EXTERNAL and specific content provider case, instead of relying on throwing



        // try opening uri locally before delegating to remote player

        mLocalPlayer = new MediaPlayer();

        try {

            mLocalPlayer.setDataSource(mContext, mUri);

            mLocalPlayer.setAudioAttributes(mAudioAttributes);

            synchronized (mPlaybackSettingsLock) {

                applyPlaybackProperties_sync();

            }

            if (mVolumeShaperConfig != null) {

                mVolumeShaper = mLocalPlayer.createVolumeShaper(mVolumeShaperConfig);

            }

            mLocalPlayer.prepare();



        } catch (SecurityException | IOException e) {

            destroyLocalPlayer();

            if (!mAllowRemote) {

                Log.w(TAG, "Remote playback not allowed: " + e);

            }

        }



        if (LOGD) {

            if (mLocalPlayer != null) {

                Log.d(TAG, "Successfully created local player");

            } else {

                Log.d(TAG, "Problem opening; delegating to remote player");

            }

        }

    }

media/java/android/media/RingtoneManager.java

+48 −10
Original line number Diff line number Diff line
@@ -481,7 +481,8 @@ public class RingtoneManager { 
            mPreviousRingtone.stop();

        }



        mPreviousRingtone = getRingtone(mContext, getRingtoneUri(position), inferStreamType());

        mPreviousRingtone =

                getRingtone(mContext, getRingtoneUri(position), inferStreamType(), true);

        return mPreviousRingtone;

    }
@@ -677,7 +678,7 @@ public class RingtoneManager { 
     */

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

        // Don't set the stream type

        return getRingtone(context, ringtoneUri, -1);

        return getRingtone(context, ringtoneUri, -1, true);

    }



    /**
@@ -698,7 +699,34 @@ public class RingtoneManager { 
            final Context context, Uri ringtoneUri,

            @Nullable VolumeShaper.Configuration volumeShaperConfig) {

        // Don't set the stream type

        return getRingtone(context, ringtoneUri, -1 /* streamType */, volumeShaperConfig);

        return getRingtone(context, ringtoneUri, -1 /* streamType */, volumeShaperConfig, true);

    }



    /**

     * @hide

     */

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

            @Nullable VolumeShaper.Configuration volumeShaperConfig,

            boolean createLocalMediaPlayer) {

        // Don't set the stream type

        return getRingtone(context, ringtoneUri, -1 /* streamType */, volumeShaperConfig,

                createLocalMediaPlayer);

    }



    /**

     * @hide

     */

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

            @Nullable VolumeShaper.Configuration volumeShaperConfig,

            AudioAttributes audioAttributes) {

        // Don't set the stream type

        Ringtone ringtone =

                getRingtone(context, ringtoneUri, -1 /* streamType */, volumeShaperConfig, false);

        if (ringtone != null) {

            ringtone.setAudioAttributesField(audioAttributes);

            ringtone.createLocalMediaPlayer();

        }

        return ringtone;

    }



    //FIXME bypass the notion of stream types within the class
@@ -710,11 +738,16 @@ public class RingtoneManager { 
     *

     * @param streamType The stream type for the ringtone, or -1 if it should

     *            not be set (and the default used instead).

     * @param createLocalMediaPlayer when true, the ringtone returned will be fully

     *      created otherwise, it will require the caller to create the media player manually

     *      {@link Ringtone#createLocalMediaPlayer()} in order to play the Ringtone.

     * @see #getRingtone(Context, Uri)

     */

    @UnsupportedAppUsage

    private static Ringtone getRingtone(final Context context, Uri ringtoneUri, int streamType) {

        return getRingtone(context, ringtoneUri, streamType, null /* volumeShaperConfig */);

    private static Ringtone getRingtone(final Context context, Uri ringtoneUri, int streamType,

            boolean createLocalMediaPlayer) {

        return getRingtone(context, ringtoneUri, streamType, null /* volumeShaperConfig */,

                createLocalMediaPlayer);

    }



    //FIXME bypass the notion of stream types within the class
@@ -730,16 +763,21 @@ public class RingtoneManager { 
     * @see #getRingtone(Context, Uri)

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private static Ringtone getRingtone(

            final Context context, Uri ringtoneUri, int streamType,

            @Nullable VolumeShaper.Configuration volumeShaperConfig) {

    private static Ringtone getRingtone(final Context context, Uri ringtoneUri, int streamType,

            @Nullable VolumeShaper.Configuration volumeShaperConfig,

            boolean createLocalMediaPlayer) {

        try {

            final Ringtone r = new Ringtone(context, true);

            if (streamType >= 0) {

                //FIXME deprecated call

                r.setStreamType(streamType);

            }



            r.setVolumeShaperConfig(volumeShaperConfig);

            r.setUri(ringtoneUri, volumeShaperConfig);

            if (createLocalMediaPlayer) {

                r.createLocalMediaPlayer();

            }

            return r;

        } catch (Exception ex) {

            Log.e(TAG, "Failed to open ringtone " + ringtoneUri + ": " + ex);

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

+2 −1
Original line number Diff line number Diff line
@@ -96,8 +96,9 @@ public class RingtonePlayer extends CoreStartable { 
            mToken = token;



            mRingtone = new Ringtone(getContextForUser(user), false);

            mRingtone.setAudioAttributes(aa);

            mRingtone.setAudioAttributesField(aa);

            mRingtone.setUri(uri, volumeShaperConfig);

            mRingtone.createLocalMediaPlayer();

        }



        @Override