commit bdcb3080b4c061a02a1a0a02f9afe20c1d29cf8a
author Sungsoo Lim <sungsoo@google.com> Tue Feb 13 09:40:13 2018 +0900
committer Sungsoo Lim <sungsoo@google.com> Wed Feb 14 11:00:07 2018 +0900
tree 10f4fbe070eaf87278cd6c1f3fc17bb55435c424
parent d0b86597fa909cd4ffe23dae02e58163f0ace8c4

MediaSession: Rename mCallbackHandler to mCallback

Support library uses reflection to the variable, mCallback, of
MediaSession. In order not to break the existing support lib
behavior on P devices, we need to keep the name.

Bug: 72979099
Test: version-compat-tests on P device
Change-Id: I5fd6c786d6a988777b94a3eb4f23d885202daa2a

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 b8184a0..b8d01c4 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -119,7 +119,8 @@
     private final ISession mBinder;
     private final CallbackStub mCbStub;
 
-    private CallbackMessageHandler mCallbackHandler;
+    // Do not change the name of mCallback. Support lib accesses this by using reflection.
+    private CallbackMessageHandler mCallback;
     private VolumeProvider mVolumeProvider;
     private PlaybackState mPlaybackState;
 
@@ -194,13 +195,13 @@
      */
     public void setCallback(@Nullable Callback callback, @Nullable Handler handler) {
         synchronized (mLock) {
-            if (mCallbackHandler != null) {
+            if (mCallback != null) {
                 // We're updating the callback, clear the session from the old one.
-                mCallbackHandler.mCallback.mSession = null;
-                mCallbackHandler.removeCallbacksAndMessages(null);
+                mCallback.mCallback.mSession = null;
+                mCallback.removeCallbacksAndMessages(null);
             }
             if (callback == null) {
-                mCallbackHandler = null;
+                mCallback = null;
                 return;
             }
             if (handler == null) {
@@ -209,7 +210,7 @@
             callback.mSession = this;
             CallbackMessageHandler msgHandler = new CallbackMessageHandler(handler.getLooper(),
                     callback);
-            mCallbackHandler = msgHandler;
+            mCallback = msgHandler;
         }
     }
 
@@ -634,8 +635,8 @@
 
     private void postToCallback(int what, Object obj, Bundle extras) {
         synchronized (mLock) {
-            if (mCallbackHandler != null) {
-                mCallbackHandler.post(what, obj, extras);
+            if (mCallback != null) {
+                mCallback.post(what, obj, extras);
             }
         }
     }