Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ib351eacf9933ebce6c35a1dc4ffb776719f8f06d
This commit is contained in:
Automerger Merge Worker
2020-03-02 10:11:55 +00:00
parent be8815d519 1c6a0fa499
commit 145303be7c
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/session/MediaSession.java
View File

@@ -196,7 +196,7 @@ public final class MediaSession {
.getSystemService(Context.MEDIA_SESSION_SERVICE); .getSystemService(Context.MEDIA_SESSION_SERVICE);
try { try {
mBinder = manager.createSession(mCbStub, tag, sessionInfo); mBinder = manager.createSession(mCbStub, tag, sessionInfo);
mSessionToken = new Token(mBinder.getController()); mSessionToken = new Token(Process.myUid(), mBinder.getController());
mController = new MediaController(context, mSessionToken); mController = new MediaController(context, mSessionToken);
} catch (RemoteException e) { } catch (RemoteException e) {
throw new RuntimeException("Remote error creating session.", e); throw new RuntimeException("Remote error creating session.", e);
@@ -771,8 +771,8 @@ public final class MediaSession {
/** /**
* @hide * @hide
*/ */
public Token(ISessionController binder) { public Token(int uid, ISessionController binder) {
mUid = Process.myUid(); mUid = uid;
mBinder = binder; mBinder = binder;
} }

5
packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java
View File

@@ -29,6 +29,7 @@ import android.content.IntentFilter;
import android.media.AudioManager; import android.media.AudioManager;
import android.media.session.MediaSession; import android.media.session.MediaSession;
import android.os.Handler; import android.os.Handler;
import android.os.Process;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
@@ -116,13 +117,13 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase {
@Test @Test
public void testOnRemoteVolumeChanged_newStream_noNullPointer() { public void testOnRemoteVolumeChanged_newStream_noNullPointer() {
MediaSession.Token token = new MediaSession.Token(null); MediaSession.Token token = new MediaSession.Token(Process.myUid(), null);
mVolumeController.mMediaSessionsCallbacksW.onRemoteVolumeChanged(token, 0); mVolumeController.mMediaSessionsCallbacksW.onRemoteVolumeChanged(token, 0);
} }
@Test @Test
public void testOnRemoteRemove_newStream_noNullPointer() { public void testOnRemoteRemove_newStream_noNullPointer() {
MediaSession.Token token = new MediaSession.Token(null); MediaSession.Token token = new MediaSession.Token(Process.myUid(), null);
mVolumeController.mMediaSessionsCallbacksW.onRemoteRemoved(token); mVolumeController.mMediaSessionsCallbacksW.onRemoteRemoved(token);
} }

2
services/core/java/com/android/server/media/MediaSessionRecord.java
View File

@@ -172,7 +172,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR
mTag = tag; mTag = tag;
mSessionInfo = sessionInfo; mSessionInfo = sessionInfo;
mController = new ControllerStub(); mController = new ControllerStub();
mSessionToken = new MediaSession.Token(mController); mSessionToken = new MediaSession.Token(ownerUid, mController);
mSession = new SessionStub(); mSession = new SessionStub();
mSessionCb = new SessionCb(cb); mSessionCb = new SessionCb(cb);
mService = service; mService = service;

5
services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java
View File

@@ -22,8 +22,8 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationChannel; import android.app.NotificationChannel;
@@ -33,6 +33,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.media.session.MediaSession; import android.media.session.MediaSession;
import android.os.Build; import android.os.Build;
import android.os.Process;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.service.notification.StatusBarNotification; import android.service.notification.StatusBarNotification;
@@ -140,7 +141,7 @@ public class NotificationComparatorTest extends UiServiceTestCase {
Notification n3 = new Notification.Builder(mContext, TEST_CHANNEL_ID) Notification n3 = new Notification.Builder(mContext, TEST_CHANNEL_ID)
.setStyle(new Notification.MediaStyle() .setStyle(new Notification.MediaStyle()
.setMediaSession(new MediaSession.Token(null))) .setMediaSession(new MediaSession.Token(Process.myUid(), null)))
.build(); .build();
mRecordDefaultMedia = new NotificationRecord(mContext, new StatusBarNotification(pkg2, mRecordDefaultMedia = new NotificationRecord(mContext, new StatusBarNotification(pkg2,
pkg2, 1, "media", uid2, uid2, n3, new UserHandle(userId), pkg2, 1, "media", uid2, uid2, n3, new UserHandle(userId),