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

Merge "Use another thread for MediaSessionRecord" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-25 10:36:58 +00:00
committed by Android (Google) Code Review
parent 10f788d8e2 3a6c1ff3a4
commit 827c121e78
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/media/MediaSessionService.java
View File

@@ -59,6 +59,7 @@ import android.net.Uri;
import android.os.Binder; import android.os.Binder;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread;
import android.os.IBinder; import android.os.IBinder;
import android.os.Message; import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;
@@ -119,6 +120,7 @@ public class MediaSessionService extends SystemService implements Monitor {
private final PowerManager.WakeLock mMediaEventWakeLock; private final PowerManager.WakeLock mMediaEventWakeLock;
private final INotificationManager mNotificationManager; private final INotificationManager mNotificationManager;
private final Object mLock = new Object(); private final Object mLock = new Object();
private final HandlerThread mRecordThread = new HandlerThread("SessionRecordThread");
// Keeps the full user id for each user. // Keeps the full user id for each user.
@GuardedBy("mLock") @GuardedBy("mLock")
private final SparseIntArray mFullUserIds = new SparseIntArray(); private final SparseIntArray mFullUserIds = new SparseIntArray();
@@ -198,6 +200,7 @@ public class MediaSessionService extends SystemService implements Monitor {
instantiateCustomProvider(null); instantiateCustomProvider(null);
instantiateCustomDispatcher(null); instantiateCustomDispatcher(null);
mRecordThread.start();
} }
private boolean isGlobalPriorityActiveLocked() { private boolean isGlobalPriorityActiveLocked() {
@@ -599,8 +602,8 @@ public class MediaSessionService extends SystemService implements Monitor {
final MediaSessionRecord session; final MediaSessionRecord session;
try { try {
session = new MediaSessionRecord(callerPid, callerUid, userId, session = new MediaSessionRecord(callerPid, callerUid, userId,
callerPackageName, cb, tag, sessionInfo, this, mHandler.getLooper(), callerPackageName, cb, tag, sessionInfo, this,
policies); mRecordThread.getLooper(), policies);
} catch (RemoteException e) { } catch (RemoteException e) {
throw new RuntimeException("Media Session owner died prematurely.", e); throw new RuntimeException("Media Session owner died prematurely.", e);
} }
@@ -1157,8 +1160,8 @@ public class MediaSessionService extends SystemService implements Monitor {
throw new SecurityException("Unexpected Session2Token's UID, expected=" + uid throw new SecurityException("Unexpected Session2Token's UID, expected=" + uid
+ " but actually=" + sessionToken.getUid()); + " but actually=" + sessionToken.getUid());
} }
MediaSession2Record record = new MediaSession2Record( MediaSession2Record record = new MediaSession2Record(sessionToken,
sessionToken, MediaSessionService.this, mHandler.getLooper(), 0); MediaSessionService.this, mRecordThread.getLooper(), 0);
synchronized (mLock) { synchronized (mLock) {
FullUserRecord user = getFullUserRecordLocked(record.getUserId()); FullUserRecord user = getFullUserRecordLocked(record.getUserId());
user.mPriorityStack.addSession(record); user.mPriorityStack.addSession(record);