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
This commit is contained in:
Jaewan Kim
2020-03-02 02:38:10 +09:00
parent f302ee2aff
commit 9f9ac53fe6

View File

@@ -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