commit 61330a3346fa64eaf36d4a298d480b7567837a94
author Insun Kang <insun@google.com> Mon Sep 11 02:11:46 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 11 02:11:46 2017 +0000
tree 25e2d72266f2c4c7791b6ea1c0107041760d7475
parent c5db8617e4c0c962845b2bb48b73d5a46599f5db
parent 62cef488de93888d6f1388b9f8c05a785faafb79

Merge "MediaSession: Remove pending callback messages when setCallback(null) is called."

media/java/android/media/session/MediaSession.java

diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index 1291dfb..b8184a0 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -119,7 +119,7 @@
     private final ISession mBinder;
     private final CallbackStub mCbStub;
 
-    private CallbackMessageHandler mCallback;
+    private CallbackMessageHandler mCallbackHandler;
     private VolumeProvider mVolumeProvider;
     private PlaybackState mPlaybackState;
 
@@ -194,16 +194,14 @@
      */
     public void setCallback(@Nullable Callback callback, @Nullable Handler handler) {
         synchronized (mLock) {
-            if (callback == null) {
-                if (mCallback != null) {
-                    mCallback.mCallback.mSession = null;
-                }
-                mCallback = null;
-                return;
-            }
-            if (mCallback != null) {
+            if (mCallbackHandler != null) {
                 // We're updating the callback, clear the session from the old one.
-                mCallback.mCallback.mSession = null;
+                mCallbackHandler.mCallback.mSession = null;
+                mCallbackHandler.removeCallbacksAndMessages(null);
+            }
+            if (callback == null) {
+                mCallbackHandler = null;
+                return;
             }
             if (handler == null) {
                 handler = new Handler();
@@ -211,7 +209,7 @@
             callback.mSession = this;
             CallbackMessageHandler msgHandler = new CallbackMessageHandler(handler.getLooper(),
                     callback);
-            mCallback = msgHandler;
+            mCallbackHandler = msgHandler;
         }
     }
 
@@ -636,8 +634,8 @@
 
     private void postToCallback(int what, Object obj, Bundle extras) {
         synchronized (mLock) {
-            if (mCallback != null) {
-                mCallback.post(what, obj, extras);
+            if (mCallbackHandler != null) {
+                mCallbackHandler.post(what, obj, extras);
             }
         }
     }