From b8748c65b8ccc645eeec95e8922058238e72cc9d Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Fri, 23 Mar 2018 10:34:18 -0700
Subject: [PATCH] PlayerBase: log when startWatching fails

Bug: 75274546
Test: set DEBUG to true, verify appOps logs in logcat
Change-Id: I19506372188dbaec0976733856513a94da75d2ea
---
 media/java/android/media/PlayerBase.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media/java/android/media/PlayerBase.java b/media/java/android/media/PlayerBase.java
index 09449a183d968..80049ba5614a6 100644
--- a/media/java/android/media/PlayerBase.java
+++ b/media/java/android/media/PlayerBase.java
@@ -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 {