commit 1664748b303aaa75027c31444c01438c2a6db574
author Ajay Panicker <apanicke@google.com> Tue Feb 14 12:27:01 2017 -0800
committer Ajay Panicker <apanicke@google.com> Tue Feb 14 22:06:22 2017 +0000
tree 6696d48e60ec7d28ea4179688b90757fd3a3be17
parent 065124a1049ec7721a0ea935a5cb8fd8355b1f8a

Prevent getting Session Token if media browser isn't connected

Bug: 35348574
Test: Sanity test browsing with VW Carkit
Change-Id: I795a19f4bd0a95d36f64bc767fdeda108c20f5ed

android/app/src/com/android/bluetooth/avrcp/BrowsedMediaPlayer.java

diff --git a/android/app/src/com/android/bluetooth/avrcp/BrowsedMediaPlayer.java b/android/app/src/com/android/bluetooth/avrcp/BrowsedMediaPlayer.java
index 6f1fe46..c8546bf 100644
--- a/android/app/src/com/android/bluetooth/avrcp/BrowsedMediaPlayer.java
+++ b/android/app/src/com/android/bluetooth/avrcp/BrowsedMediaPlayer.java
@@ -212,31 +212,23 @@
             }
 
             if (!mMediaBrowser.isConnected()) {
-                isError = true;
-                Log.e(TAG, "setBrowsedPlayer : Not connected");
-            }
-
-            if ((token = mMediaBrowser.getSessionToken()) == null) {
-                isError = true;
-                Log.e(TAG, "setBrowsedPlayer : No Session token");
-            }
-
-            if (isError == false) {
+                Log.e(TAG, "setBrowsedPlayer: " + mPackageName + "not connected");
+            } else if ((token = mMediaBrowser.getSessionToken()) == null) {
+                Log.e(TAG, "setBrowsedPlayer: " + mPackageName + "no Session token");
+            } else {
                 mMediaController = MediaController.wrap(
                     new android.media.session.MediaController(mContext, token));
                 /* get root folder items */
                 mMediaBrowser.subscribe(mRootFolderUid, folderItemsCb);
+                return;
             }
         } catch (NullPointerException ex) {
-            isError = true;
             Log.e(TAG, "setBrowsedPlayer : Null pointer during init");
             ex.printStackTrace();
         }
 
-        if (isError) {
-            mMediaInterface.setBrowsedPlayerRsp(mBDAddr, AvrcpConstants.RSP_INTERNAL_ERR,
-                    (byte)0x00, 0, null);
-        }
+        mMediaInterface.setBrowsedPlayerRsp(
+                mBDAddr, AvrcpConstants.RSP_INTERNAL_ERR, (byte) 0x00, 0, null);
     }
 
     public void setBrowsed(String packageName, String cls) {