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

Commit 73777b55 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "PlayerBase: log when startWatching fails" into pi-dev 

am: 3d9601d6

Change-Id: Ifbaa316e788886e8b6503ae39f5ffcea9dc04ab6
parents 1b441b13 3d9601d6

media/java/android/media/PlayerBase.java

+3 −2
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ import java.util.Objects; 
public abstract class PlayerBase {



    private static final String TAG = "PlayerBase";

    private static final boolean DEBUG = false;

    private static IAudioService sService; //lazy initialization, use getService()

    /** Debug app ops */

    private static final boolean DEBUG_APP_OPS = false;

    private static final boolean DEBUG = DEBUG_APP_OPS || false;

    private static IAudioService sService; //lazy initialization, use getService()



    // parameters of the player that affect AppOps

    protected AudioAttributes mAttributes;
@@ -102,6 +102,7 @@ public abstract class PlayerBase { 
            mAppOps.startWatchingMode(AppOpsManager.OP_PLAY_AUDIO,

                    ActivityThread.currentPackageName(), mAppOpsCallback);

        } catch (RemoteException e) {

            Log.e(TAG, "Error registering appOps callback", e);

            mHasAppOpsPlayAudio = false;

        }

        try {