From 9f9ac53fe64c9a54cc2e1ad3219eaf67d6b05fd3 Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Mon, 2 Mar 2020 02:38:10 +0900
Subject: [PATCH] Fix MediaSession.Token#equals()

This also fixes the Activity#setMediaController() which previously
ignored because the MediaSessionService failed to find session set to
the foreground activity.

Bug: 149006225
Test: Run MediaActivityTest in CtsMediaTestCases
Change-Id: I18d3097f7b20275a20b1de789be6884f843668ae
---
 .../android/settings/media/MediaOutputIndicatorSliceTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
index fa926df959a..70978894cf0 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
@@ -35,6 +35,7 @@ import android.media.AudioManager;
 import android.media.session.MediaController;
 import android.media.session.MediaSession;
 import android.net.Uri;
+import android.os.Process;
 import android.text.TextUtils;
 
 import androidx.slice.Slice;
@@ -109,7 +110,7 @@ public class MediaOutputIndicatorSliceTest {
         mAudioManager.setMode(AudioManager.MODE_NORMAL);
         sMediaOutputIndicatorWorker = spy(new MediaOutputIndicatorWorker(mContext,
                 MEDIA_OUTPUT_INDICATOR_SLICE_URI));
-        mToken = new MediaSession.Token(null);
+        mToken = new MediaSession.Token(Process.myUid(), null);
         // Set-up specs for SliceMetadata.
         SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
         // Setup Bluetooth environment