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

Merge "Notify the system of all remote volume changes" into lmp-mr1-dev

Browse Source
This commit is contained in:
RoboErik
2015-01-16 22:56:52 +00:00
committed by Android (Google) Code Review
parent 2f63207d87 9c5b7cb048
commit d5ff63ba0c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,6 +330,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
if (volumeBefore != mOptimisticVolume) { if (volumeBefore != mOptimisticVolume) {
pushVolumeUpdate(); pushVolumeUpdate();
} }
mService.notifyRemoteVolumeChanged(flags, this);
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Adjusted optimistic volume to " + mOptimisticVolume + " max is " Log.d(TAG, "Adjusted optimistic volume to " + mOptimisticVolume + " max is "
@@ -357,6 +358,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
if (volumeBefore != mOptimisticVolume) { if (volumeBefore != mOptimisticVolume) {
pushVolumeUpdate(); pushVolumeUpdate();
} }
mService.notifyRemoteVolumeChanged(flags, this);
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Set optimistic volume to " + mOptimisticVolume + " max is " Log.d(TAG, "Set optimistic volume to " + mOptimisticVolume + " max is "

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

@@ -143,6 +143,20 @@ public class MediaSessionService extends SystemService implements Monitor {
mHandler.post(MessageHandler.MSG_SESSIONS_CHANGED, record.getUserId(), 0); mHandler.post(MessageHandler.MSG_SESSIONS_CHANGED, record.getUserId(), 0);
} }
/**
* Tells the system UI that volume has changed on a remote session.
*/
public void notifyRemoteVolumeChanged(int flags, MediaSessionRecord session) {
if (mRvc == null) {
return;
}
try {
mRvc.remoteVolumeChanged(session.getControllerBinder(), flags);
} catch (Exception e) {
Log.wtf(TAG, "Error sending volume change to system UI.", e);
}
}
public void onSessionPlaystateChange(MediaSessionRecord record, int oldState, int newState) { public void onSessionPlaystateChange(MediaSessionRecord record, int oldState, int newState) {
boolean updateSessions = false; boolean updateSessions = false;
synchronized (mLock) { synchronized (mLock) {
@@ -864,14 +878,6 @@ public class MediaSessionService extends SystemService implements Monitor {
} else { } else {
session.adjustVolume(direction, flags, getContext().getPackageName(), session.adjustVolume(direction, flags, getContext().getPackageName(),
UserHandle.myUserId(), true); UserHandle.myUserId(), true);
if (session.getPlaybackType() == PlaybackInfo.PLAYBACK_TYPE_REMOTE
&& mRvc != null && direction != MediaSessionManager.DIRECTION_MUTE) {
try {
mRvc.remoteVolumeChanged(session.getControllerBinder(), flags);
} catch (Exception e) {
Log.wtf(TAG, "Error sending volume change to system UI.", e);
}
}
} }
} }