Allow registering multiple RemoteVolumeController
Bug: 126890783
Test: flashed and change volume while casting
Change-Id: I6e0624161c29f9d4d81ade218d3bcfb2a0429351
diff --git a/media/java/android/media/session/ISessionManager.aidl b/media/java/android/media/session/ISessionManager.aidl
index e85461f..cfcc294 100644
--- a/media/java/android/media/session/ISessionManager.aidl
+++ b/media/java/android/media/session/ISessionManager.aidl
@@ -55,8 +55,8 @@
void addSession2TokensListener(in ISession2TokensListener listener, int userId);
void removeSession2TokensListener(in ISession2TokensListener listener);
- // This is for the system volume UI only
- void setRemoteVolumeController(in IRemoteVolumeController rvc);
+ void registerRemoteVolumeController(in IRemoteVolumeController rvc);
+ void unregisterRemoteVolumeController(in IRemoteVolumeController rvc);
// For PhoneWindowManager to precheck media keys
boolean isGlobalPriorityActive();
diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java
index fde4f88..f530442 100644
--- a/media/java/android/media/session/MediaSessionManager.java
+++ b/media/java/android/media/session/MediaSessionManager.java
@@ -424,17 +424,33 @@
}
/**
- * Set the remote volume controller to receive volume updates on. Only for
- * use by system UI.
+ * Set the remote volume controller to receive volume updates on.
+ * Only for use by System UI and Settings application.
*
* @param rvc The volume controller to receive updates on.
* @hide
*/
- public void setRemoteVolumeController(IRemoteVolumeController rvc) {
+ public void registerRemoteVolumeController(IRemoteVolumeController rvc) {
try {
- mService.setRemoteVolumeController(rvc);
+ mService.registerRemoteVolumeController(rvc);
} catch (RemoteException e) {
- Log.e(TAG, "Error in setRemoteVolumeController.", e);
+ Log.e(TAG, "Error in registerRemoteVolumeController.", e);
+ }
+ }
+
+ /**
+ * Unregisters the remote volume controller which was previously registered with
+ * {@link #registerRemoteVolumeController(IRemoteVolumeController)}.
+ * Only for use by System UI and Settings application.
+ *
+ * @param rvc The volume controller which was registered.
+ * @hide
+ */
+ public void unregisterRemoteVolumeController(IRemoteVolumeController rvc) {
+ try {
+ mService.unregisterRemoteVolumeController(rvc);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error in unregisterRemoteVolumeController.", e);
}
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/volume/MediaSessions.java b/packages/SettingsLib/src/com/android/settingslib/volume/MediaSessions.java
index 4ed1154..f6cd971 100644
--- a/packages/SettingsLib/src/com/android/settingslib/volume/MediaSessions.java
+++ b/packages/SettingsLib/src/com/android/settingslib/volume/MediaSessions.java
@@ -95,7 +95,7 @@
mMgr.addOnActiveSessionsChangedListener(mSessionsListener, null, mHandler);
mInit = true;
postUpdateSessions();
- mMgr.setRemoteVolumeController(mRvc);
+ mMgr.registerRemoteVolumeController(mRvc);
}
protected void postUpdateSessions() {
@@ -110,6 +110,7 @@
if (D.BUG) Log.d(TAG, "destroy");
mInit = false;
mMgr.removeOnActiveSessionsChangedListener(mSessionsListener);
+ mMgr.unregisterRemoteVolumeController(mRvc);
}
/**
diff --git a/services/core/java/com/android/server/media/MediaSessionServiceImpl.java b/services/core/java/com/android/server/media/MediaSessionServiceImpl.java
index b86328b..94f289f 100644
--- a/services/core/java/com/android/server/media/MediaSessionServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaSessionServiceImpl.java
@@ -64,6 +64,7 @@
import android.os.Message;
import android.os.PowerManager;
import android.os.Process;
+import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.ServiceManager;
@@ -138,9 +139,9 @@
private MediaSessionRecord mGlobalPrioritySession;
private AudioPlayerStateMonitor mAudioPlayerStateMonitor;
- // Used to notify system UI when remote volume was changed. TODO find a
- // better way to handle this.
- private IRemoteVolumeController mRvc;
+ // Used to notify System UI and Settings when remote volume was changed.
+ final RemoteCallbackList<IRemoteVolumeController> mRemoteVolumeControllers =
+ new RemoteCallbackList<>();
public MediaSessionServiceImpl(Context context) {
mContext = context;
@@ -281,20 +282,23 @@
}
/**
- * Tells the system UI that volume has changed on an active remote session.
+ * Tells the System UI and Settings app that volume has changed on an active remote session.
*/
public void notifyRemoteVolumeChanged(int flags, MediaSessionRecord session) {
- synchronized (mLock) {
- if (mRvc == null || !session.isActive()) {
- return;
- }
+ if (!session.isActive()) {
+ return;
+ }
+ int size = mRemoteVolumeControllers.beginBroadcast();
+ MediaSession.Token token = session.getSessionToken();
+ for (int i = size - 1; i >= 0; i--) {
try {
- mRvc.remoteVolumeChanged(session.getSessionToken(), flags);
+ IRemoteVolumeController cb = mRemoteVolumeControllers.getBroadcastItem(i);
+ cb.remoteVolumeChanged(token, flags);
} catch (Exception e) {
- Log.w(TAG, "Error sending volume change to system UI.", e);
- mRvc = null;
+ Log.w(TAG, "Error sending volume change.", e);
}
}
+ mRemoteVolumeControllers.finishBroadcast();
}
@Override
@@ -497,7 +501,7 @@
*/
private void enforceMediaPermissions(ComponentName compName, int pid, int uid,
int resolvedUserId) {
- if (isCurrentVolumeController(pid, uid)) return;
+ if (hasStatusBarServicePermission(pid, uid)) return;
if (mContext
.checkPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL, pid, uid)
!= PackageManager.PERMISSION_GRANTED
@@ -507,14 +511,14 @@
}
}
- private boolean isCurrentVolumeController(int pid, int uid) {
+ private boolean hasStatusBarServicePermission(int pid, int uid) {
return mContext.checkPermission(android.Manifest.permission.STATUS_BAR_SERVICE,
pid, uid) == PackageManager.PERMISSION_GRANTED;
}
- private void enforceSystemUiPermission(String action, int pid, int uid) {
- if (!isCurrentVolumeController(pid, uid)) {
- throw new SecurityException("Only system ui may " + action);
+ private void enforceStatusBarServicePermission(String action, int pid, int uid) {
+ if (!hasStatusBarServicePermission(pid, uid)) {
+ throw new SecurityException("Only System UI and Settings may " + action);
}
}
@@ -638,20 +642,25 @@
}
private void pushRemoteVolumeUpdateLocked(int userId) {
- if (mRvc != null) {
+ FullUserRecord user = getFullUserRecordLocked(userId);
+ if (user == null) {
+ Log.w(TAG, "pushRemoteVolumeUpdateLocked failed. No user with id=" + userId);
+ return;
+ }
+
+ 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 {
- FullUserRecord user = getFullUserRecordLocked(userId);
- if (user == null) {
- Log.w(TAG, "pushRemoteVolumeUpdateLocked failed. No user with id=" + userId);
- return;
- }
- MediaSessionRecord record = user.mPriorityStack.getDefaultRemoteSession(userId);
- mRvc.updateRemoteController(record == null ? null : record.getSessionToken());
- } catch (RemoteException e) {
- Log.w(TAG, "Error sending default remote volume to sys ui.", e);
- mRvc = null;
+ IRemoteVolumeController cb = mRemoteVolumeControllers.getBroadcastItem(i);
+ cb.updateRemoteController(token);
+ } catch (Exception e) {
+ Log.w(TAG, "Error sending default remote volume.", e);
}
}
+ mRemoteVolumeControllers.finishBroadcast();
}
void pushSession2TokensChangedLocked(int userId) {
@@ -1661,15 +1670,26 @@
}
@Override
- public void setRemoteVolumeController(IRemoteVolumeController rvc) {
+ public void registerRemoteVolumeController(IRemoteVolumeController rvc) {
final int pid = Binder.getCallingPid();
final int uid = Binder.getCallingUid();
final long token = Binder.clearCallingIdentity();
try {
- enforceSystemUiPermission("listen for volume changes", pid, uid);
- synchronized (mLock) {
- mRvc = rvc;
- }
+ enforceStatusBarServicePermission("listen for volume changes", pid, uid);
+ mRemoteVolumeControllers.register(rvc);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
+ @Override
+ public void unregisterRemoteVolumeController(IRemoteVolumeController rvc) {
+ 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);
}
@@ -1755,8 +1775,8 @@
private boolean hasMediaControlPermission(int resolvedUserId, String packageName,
int pid, int uid) throws RemoteException {
- // Allow API calls from the System UI
- if (isCurrentVolumeController(pid, uid)) {
+ // Allow API calls from the System UI and Settings
+ if (hasStatusBarServicePermission(pid, uid)) {
return true;
}