PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix MediaSession.Token#equals()" into rvc-dev

Browse Source
This commit is contained in:
Jaewan Kim
2020-03-02 06:28:20 +00:00
committed by Android (Google) Code Review
parent 1f0c0b18e4 9f9ac53fe6
commit 18e16e416d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
View File

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