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

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

Merge "Playback activity monitor: fix MediaPlayer / AudioTrack reporting" into... 

Merge "Playback activity monitor: fix MediaPlayer / AudioTrack reporting" into sc-dev am: 2fd099f1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc86cf17be10f41a9e797549bc4e97eb3e672d75
parents f2387ce2 2fd099f1

media/java/android/media/AudioPlaybackConfiguration.java

+15 −0
Original line number Diff line number Diff line
@@ -181,6 +181,21 @@ public final class AudioPlaybackConfiguration implements Parcelable { 
    @Retention(RetentionPolicy.SOURCE)

    public @interface PlayerState {}



    /** @hide */

    public static String playerStateToString(@PlayerState int state) {

        switch (state) {

            case PLAYER_STATE_UNKNOWN: return "PLAYER_STATE_UNKNOWN";

            case PLAYER_STATE_RELEASED: return "PLAYER_STATE_RELEASED";

            case PLAYER_STATE_IDLE: return "PLAYER_STATE_IDLE";

            case PLAYER_STATE_STARTED: return "PLAYER_STATE_STARTED";

            case PLAYER_STATE_PAUSED: return "PLAYER_STATE_PAUSED";

            case PLAYER_STATE_STOPPED: return "PLAYER_STATE_STOPPED";

            case PLAYER_UPDATE_DEVICE_ID: return "PLAYER_UPDATE_DEVICE_ID";

            default:

                return "invalid state " + state;

        }

    }



    // immutable data

    private final int mPlayerIId;

media/java/android/media/AudioTrack.java

+3 −1
Original line number Diff line number Diff line
@@ -2726,8 +2726,10 @@ public class AudioTrack extends PlayerBase 
            }

        }

        synchronized(mPlayStateLock) {

            baseStart(0); // unknown device at this point

            native_start();

            baseStart(native_getRoutedDeviceId());

            // FIXME see b/179218630

            //baseStart(native_getRoutedDeviceId());

            if (mPlayState == PLAYSTATE_PAUSED_STOPPING) {

                mPlayState = PLAYSTATE_STOPPING;

            } else {

media/java/android/media/MediaPlayer.java

+11 −5
Original line number Diff line number Diff line
@@ -1357,6 +1357,7 @@ public class MediaPlayer extends PlayerBase 
    }



    private void startImpl() {

        baseStart(0); // unknown device at this point

        stayAwake(true);

        _start();

    }
@@ -1382,6 +1383,7 @@ public class MediaPlayer extends PlayerBase 
    public void stop() throws IllegalStateException {

        stayAwake(false);

        _stop();

        baseStop();

    }



    private native void _stop() throws IllegalStateException;
@@ -1395,6 +1397,7 @@ public class MediaPlayer extends PlayerBase 
    public void pause() throws IllegalStateException {

        stayAwake(false);

        _pause();

        basePause();

    }



    private native void _pause() throws IllegalStateException;
@@ -3480,7 +3483,8 @@ public class MediaPlayer extends PlayerBase 
            case MEDIA_STOPPED:

                {

                    tryToDisableNativeRoutingCallback();

                    baseStop();

                    // FIXME see b/179218630

                    //baseStop();

                    TimeProvider timeProvider = mTimeProvider;

                    if (timeProvider != null) {

                        timeProvider.onStopped();
@@ -3490,15 +3494,17 @@ public class MediaPlayer extends PlayerBase 


            case MEDIA_STARTED:

                {

                    baseStart(native_getRoutedDeviceId());

                    // FIXME see b/179218630

                    //baseStart(native_getRoutedDeviceId());

                    tryToEnableNativeRoutingCallback();

                }

                // fall through

            case MEDIA_PAUSED:

                {

                    if (msg.what == MEDIA_PAUSED) {

                        basePause();

                    }

                    // FIXME see b/179218630

                    //if (msg.what == MEDIA_PAUSED) {

                    //    basePause();

                    //}

                    TimeProvider timeProvider = mTimeProvider;

                    if (timeProvider != null) {

                        timeProvider.onPaused(msg.what == MEDIA_PAUSED);

services/core/java/com/android/server/audio/PlaybackActivityMonitor.java

+2 −2
Original line number Diff line number Diff line
@@ -264,8 +264,8 @@ public final class PlaybackActivityMonitor 
     */

    public void playerEvent(int piid, int event, int deviceId, int binderUid) {

        if (DEBUG) {

            Log.v(TAG, String.format("playerEvent(piid=%d, deviceId=%d, event=%d)",

                    piid, deviceId, event));

            Log.v(TAG, String.format("playerEvent(piid=%d, deviceId=%d, event=%s)",

                    piid, deviceId, AudioPlaybackConfiguration.playerStateToString(event)));

        }

        final boolean change;

        synchronized(mPlayerLock) {