commit d934c71556b215d2a7a4151137fa8ff624aadfd1
author Simon Dai <sdai@google.com> Wed Aug 07 17:26:26 2019 -0700
committer Simon Dai <sdai@google.com> Thu Aug 08 18:41:30 2019 +0000
tree 59a8f7d6e91dac7bcd9d67897c95364556d3c9b4
parent ba2c1fdca3a3d24ce7f022b78192a82f4b8da4e1

Fix autoplay logic

This fixes a race for Bluetooth's media controller, which becomes active
on boot, which sometimes prevented autoplay from functioning.
Also, calls prepare() on media controllers (seems to have been lost in a
previous change)

Fixes: 139092572
Test: Manual
Change-Id: I4b0c3c5b960d48d199e287c6b48b116ee6a604f8

service/src/com/android/car/CarMediaService.java

diff --git a/service/src/com/android/car/CarMediaService.java b/service/src/com/android/car/CarMediaService.java
index 1c947d2..5b7856c 100644
--- a/service/src/com/android/car/CarMediaService.java
+++ b/service/src/com/android/car/CarMediaService.java
@@ -146,7 +146,6 @@
             if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
                 Log.d(CarLog.TAG_MEDIA, "Switched to user " + mCurrentUser);
             }
-            updateMediaSessionCallbackForCurrentUser();
             if (mUserManager.isUserUnlocked(mCurrentUser)) {
                 initUser();
             } else {
@@ -201,6 +200,7 @@
         String key = PLAYBACK_STATE_KEY + mCurrentUser;
         mStartPlayback =
                 mSharedPrefs.getInt(key, PlaybackState.STATE_NONE) == PlaybackState.STATE_PLAYING;
+        updateMediaSessionCallbackForCurrentUser();
         notifyListeners();
     }
 
@@ -310,14 +310,35 @@
                 null, ActivityManager.getCurrentUser()));
     }
 
+    private void prepare() {
+        if (mActiveUserMediaController != null) {
+            if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
+                Log.d(CarLog.TAG_MEDIA, "prepare " + mActiveUserMediaController.getPackageName());
+            }
+            TransportControls controls = mActiveUserMediaController.getTransportControls();
+            if (controls != null) {
+                controls.prepare();
+            } else {
+                Log.e(CarLog.TAG_MEDIA, "Can't prepare playback, transport controls unavailable "
+                        + mActiveUserMediaController.getPackageName());
+            }
+        }
+    }
+
     /**
      * Attempts to play the current source using MediaController.TransportControls.play()
      */
     private void play() {
         if (mActiveUserMediaController != null) {
+            if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
+                Log.d(CarLog.TAG_MEDIA, "playing " + mActiveUserMediaController.getPackageName());
+            }
             TransportControls controls = mActiveUserMediaController.getTransportControls();
             if (controls != null) {
                 controls.play();
+            } else {
+                Log.e(CarLog.TAG_MEDIA, "Can't start playback, transport controls unavailable "
+                        + mActiveUserMediaController.getPackageName());
             }
         }
     }
@@ -327,9 +348,15 @@
      */
     private void stop() {
         if (mActiveUserMediaController != null) {
+            if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
+                Log.d(CarLog.TAG_MEDIA, "stopping " + mActiveUserMediaController.getPackageName());
+            }
             TransportControls controls = mActiveUserMediaController.getTransportControls();
             if (controls != null) {
                 controls.stop();
+            } else {
+                Log.e(CarLog.TAG_MEDIA, "Can't stop playback, transport controls unavailable "
+                        + mActiveUserMediaController.getPackageName());
             }
         }
     }
@@ -422,9 +449,11 @@
             mCallbacks = updatedCallbacks;
             updatePrimaryMediaSourceWithCurrentlyPlaying(additions);
             // If there are no playing media sources, and we don't currently have the controller
-            // for the active source, check the new active sessions for a matching controller.
+            // for the active source, check the active sessions for a matching controller. If this
+            // is called after a user switch, its possible for a matching controller to already be
+            // active before the user is unlocked, so we check all of the current controllers
             if (mActiveUserMediaController == null) {
-                updateActiveMediaController(additions);
+                updateActiveMediaController(newControllers);
             }
         }
 
@@ -656,6 +685,7 @@
         for (MediaController controller : mediaControllers) {
             if (matchPrimaryMediaSource(controller.getPackageName(), getClassName(controller))) {
                 mActiveUserMediaController = controller;
+                prepare();
                 // Specify Handler to receive callbacks on, to avoid defaulting to the calling
                 // thread; this method can be called from the MediaSessionManager callback.
                 // Using the version of this method without passing a handler causes a