Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 143575e1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e41 

Change-Id: Ic4fd81e813044d707d1e3067ed6047c03a67b98c
parents 3ea368bc 18e16e41

tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import android.media.AudioManager; 
import android.media.session.MediaController;

import android.media.session.MediaController;

import android.media.session.MediaSession;

import android.media.session.MediaSession;

import android.net.Uri;

import android.net.Uri;

import android.os.Process;

import android.text.TextUtils;

import android.text.TextUtils;





import androidx.slice.Slice;

import androidx.slice.Slice;
@@ -109,7 +110,7 @@ public class MediaOutputIndicatorSliceTest { 
        mAudioManager.setMode(AudioManager.MODE_NORMAL);

        mAudioManager.setMode(AudioManager.MODE_NORMAL);

        sMediaOutputIndicatorWorker = spy(new MediaOutputIndicatorWorker(mContext,

        sMediaOutputIndicatorWorker = spy(new MediaOutputIndicatorWorker(mContext,

                MEDIA_OUTPUT_INDICATOR_SLICE_URI));

                MEDIA_OUTPUT_INDICATOR_SLICE_URI));

        mToken = new MediaSession.Token(null);

        mToken = new MediaSession.Token(Process.myUid(), null);

        // Set-up specs for SliceMetadata.

        // Set-up specs for SliceMetadata.

        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);

        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);

        // Setup Bluetooth environment

        // Setup Bluetooth environment