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

Merge "Remove ControllerLink"

Browse Source
This commit is contained in:
Hyundo Moon
2019-03-18 10:03:07 +00:00
committed by Android (Google) Code Review
parent d1089d5c11 da73f26923
commit eecf8a55fd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/notification/RemoteVolumePreferenceControllerTest.java
View File

@@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.media.session.ControllerLink; import android.media.session.ISessionController;
import android.media.session.MediaController; import android.media.session.MediaController;
import android.media.session.MediaSession; import android.media.session.MediaSession;
import android.media.session.MediaSessionManager; import android.media.session.MediaSessionManager;
@@ -51,9 +51,9 @@ public class RemoteVolumePreferenceControllerTest {
@Mock @Mock
private MediaController mMediaController; private MediaController mMediaController;
@Mock @Mock
private ControllerLink.ControllerStub mStub; private ISessionController mStub;
@Mock @Mock
private ControllerLink.ControllerStub mStub2; private ISessionController mStub2;
private MediaSession.Token mToken; private MediaSession.Token mToken;
private MediaSession.Token mToken2; private MediaSession.Token mToken2;
private RemoteVolumePreferenceController mController; private RemoteVolumePreferenceController mController;
@@ -71,8 +71,8 @@ public class RemoteVolumePreferenceControllerTest {
mActiveSessions.add(mMediaController); mActiveSessions.add(mMediaController);
when(mMediaSessionManager.getActiveSessions(null)).thenReturn( when(mMediaSessionManager.getActiveSessions(null)).thenReturn(
mActiveSessions); mActiveSessions);
mToken = new MediaSession.Token(new ControllerLink(mStub)); mToken = new MediaSession.Token(mStub);
mToken2 = new MediaSession.Token(new ControllerLink(mStub2)); mToken2 = new MediaSession.Token(mStub2);
mController = new RemoteVolumePreferenceController(mContext); mController = new RemoteVolumePreferenceController(mContext);
mPlaybackInfo = new MediaController.PlaybackInfo( mPlaybackInfo = new MediaController.PlaybackInfo(