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

Merge "Guard remote volume controllers with a lock" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-16 22:38:03 +00:00
committed by Android (Google) Code Review
parent b8c956824b 2a7b95f4a6
commit ec300169e2
1 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
services/core/java/com/android/server/media/MediaSessionServiceImpl.java
View File

@@ -140,6 +140,7 @@ public class MediaSessionServiceImpl extends MediaSessionService.ServiceImpl {
private AudioPlayerStateMonitor mAudioPlayerStateMonitor;
// Used to notify System UI and Settings when remote volume was changed.
@GuardedBy("mLock")
final RemoteCallbackList<IRemoteVolumeController> mRemoteVolumeControllers =
new RemoteCallbackList<>();
@@ -287,17 +288,19 @@ public class MediaSessionServiceImpl extends MediaSessionService.ServiceImpl {
if (!session.isActive()) {
return;
}
int size = mRemoteVolumeControllers.beginBroadcast();
MediaSession.Token token = session.getSessionToken();
for (int i = size - 1; i >= 0; i--) {
try {
IRemoteVolumeController cb = mRemoteVolumeControllers.getBroadcastItem(i);
cb.remoteVolumeChanged(token, flags);
} catch (Exception e) {
Log.w(TAG, "Error sending volume change.", e);
synchronized (mLock) {
int size = mRemoteVolumeControllers.beginBroadcast();
MediaSession.Token token = session.getSessionToken();
for (int i = size - 1; i >= 0; i--) {
try {
IRemoteVolumeController cb = mRemoteVolumeControllers.getBroadcastItem(i);
cb.remoteVolumeChanged(token, flags);
} catch (Exception e) {
Log.w(TAG, "Error sending volume change.", e);
}
}
mRemoteVolumeControllers.finishBroadcast();
}
mRemoteVolumeControllers.finishBroadcast();
}
@Override
@@ -647,19 +650,21 @@ public class MediaSessionServiceImpl extends MediaSessionService.ServiceImpl {
return;
}
int size = mRemoteVolumeControllers.beginBroadcast();
MediaSessionRecord record = user.mPriorityStack.getDefaultRemoteSession(userId);
MediaSession.Token token = record == null ? null : record.getSessionToken();
synchronized (mLock) {
int size = mRemoteVolumeControllers.beginBroadcast();
MediaSessionRecord record = user.mPriorityStack.getDefaultRemoteSession(userId);
MediaSession.Token token = record == null ? null : record.getSessionToken();
for (int i = size - 1; i >= 0; i--) {
try {
IRemoteVolumeController cb = mRemoteVolumeControllers.getBroadcastItem(i);
cb.updateRemoteController(token);
} catch (Exception e) {
Log.w(TAG, "Error sending default remote volume.", e);
for (int i = size - 1; i >= 0; i--) {
try {
IRemoteVolumeController cb = mRemoteVolumeControllers.getBroadcastItem(i);
cb.updateRemoteController(token);
} catch (Exception e) {
Log.w(TAG, "Error sending default remote volume.", e);
}
}
mRemoteVolumeControllers.finishBroadcast();
}
mRemoteVolumeControllers.finishBroadcast();
}
void pushSession2TokensChangedLocked(int userId) {
@@ -1676,11 +1681,13 @@ public class MediaSessionServiceImpl extends MediaSessionService.ServiceImpl {
final int pid = Binder.getCallingPid();
final int uid = Binder.getCallingUid();
final long token = Binder.clearCallingIdentity();
try {
enforceStatusBarServicePermission("listen for volume changes", pid, uid);
mRemoteVolumeControllers.register(rvc);
} finally {
Binder.restoreCallingIdentity(token);
synchronized (mLock) {
try {
enforceStatusBarServicePermission("listen for volume changes", pid, uid);
mRemoteVolumeControllers.register(rvc);
} finally {
Binder.restoreCallingIdentity(token);
}
}
}
@@ -1689,11 +1696,13 @@ public class MediaSessionServiceImpl extends MediaSessionService.ServiceImpl {
final int pid = Binder.getCallingPid();
final int uid = Binder.getCallingUid();
final long token = Binder.clearCallingIdentity();
try {
enforceStatusBarServicePermission("listen for volume changes", pid, uid);
mRemoteVolumeControllers.unregister(rvc);
} finally {
Binder.restoreCallingIdentity(token);
synchronized (mLock) {
try {
enforceStatusBarServicePermission("listen for volume changes", pid, uid);
mRemoteVolumeControllers.unregister(rvc);
} finally {
Binder.restoreCallingIdentity(token);
}
}
}