Remove all handler messages when controller is released

Issue: #74 PiperOrigin-RevId: 448205908
androidx · May 24, 2022 · 9b07d71 · 9b07d71
1 parent efb49f2
commit 9b07d71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -89,6 +89,8 @@
         ([#59](https://github.com/androidx/media/pull/59))
     *   Update session position info on timeline
         change([#51](https://github.com/androidx/media/issues/51))
+    *   Fix NPE in MediaControllerImplBase after releasing controller
+        ([#74](https://github.com/androidx/media/issues/74))
 
 *   Data sources:
 

diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java
@@ -309,6 +309,7 @@ public void release() {
       serviceConnection = null;
     }
     connectedToken = null;
+    flushCommandQueueHandler.removeCallbacksAndMessages(/* token= */ null);
     this.iSession = null;
     controllerStub.destroy();
     if (iSession != null) {
@@ -3046,9 +3047,9 @@ public void handleMessage(Message msg) {
     }
 
     public void sendFlushCommandQueueMessage() {
-      // Send message to notify the end of the transaction. It will be handled when the current
-      // looper iteration is over.
-      if (!hasMessages(MSG_FLUSH_COMMAND_QUEUE)) {
+      if (iSession != null && !hasMessages(MSG_FLUSH_COMMAND_QUEUE)) {
+        // Send message to notify the end of the transaction. It will be handled when the current
+        // looper iteration is over.
         sendEmptyMessage(MSG_FLUSH_COMMAND_QUEUE);
       }
     }