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

am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev

Browse Source 
* commit '9af44ddf0367c542d6c1db6060456bd72f3c83ca':
  Post volume requests to the handler thread in MediaSession
This commit is contained in:
RoboErik
2014-11-05 18:49:54 +00:00
committed by Android Git Automerger
parent e2b8dab0d0 9af44ddf03
commit acbdb4fe5d
1 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,7 +286,9 @@ public final class MediaSession {
if (volumeProvider == null) { if (volumeProvider == null) {
throw new IllegalArgumentException("volumeProvider may not be null!"); throw new IllegalArgumentException("volumeProvider may not be null!");
} }
mVolumeProvider = volumeProvider; synchronized (mLock) {
mVolumeProvider = volumeProvider;
}
volumeProvider.setCallback(new VolumeProvider.Callback() { volumeProvider.setCallback(new VolumeProvider.Callback() {
@Override @Override
public void onVolumeChanged(VolumeProvider volumeProvider) { public void onVolumeChanged(VolumeProvider volumeProvider) {
@@ -491,9 +493,11 @@ public final class MediaSession {
* @hide * @hide
*/ */
public void notifyRemoteVolumeChanged(VolumeProvider provider) { public void notifyRemoteVolumeChanged(VolumeProvider provider) {
if (provider == null || provider != mVolumeProvider) { synchronized (mLock) {
Log.w(TAG, "Received update from stale volume provider"); if (provider == null || provider != mVolumeProvider) {
return; Log.w(TAG, "Received update from stale volume provider");
return;
}
} }
try { try {
mBinder.setCurrentVolume(provider.getCurrentVolume()); mBinder.setCurrentVolume(provider.getCurrentVolume());
@@ -558,6 +562,14 @@ public final class MediaSession {
postToCallback(CallbackMessageHandler.MSG_MEDIA_BUTTON, mediaButtonIntent); postToCallback(CallbackMessageHandler.MSG_MEDIA_BUTTON, mediaButtonIntent);
} }
private void dispatchAdjustVolume(int direction) {
postToCallback(CallbackMessageHandler.MSG_ADJUST_VOLUME, direction);
}
private void dispatchSetVolumeTo(int volume) {
postToCallback(CallbackMessageHandler.MSG_SET_VOLUME, volume);
}
private void postToCallback(int what) { private void postToCallback(int what) {
postToCallback(what, null); postToCallback(what, null);
} }
@@ -1009,9 +1021,7 @@ public final class MediaSession {
public void onAdjustVolume(int direction) { public void onAdjustVolume(int direction) {
MediaSession session = mMediaSession.get(); MediaSession session = mMediaSession.get();
if (session != null) { if (session != null) {
if (session.mVolumeProvider != null) { session.dispatchAdjustVolume(direction);
session.mVolumeProvider.onAdjustVolume(direction);
}
} }
} }
@@ -1019,9 +1029,7 @@ public final class MediaSession {
public void onSetVolumeTo(int value) { public void onSetVolumeTo(int value) {
MediaSession session = mMediaSession.get(); MediaSession session = mMediaSession.get();
if (session != null) { if (session != null) {
if (session.mVolumeProvider != null) { session.dispatchSetVolumeTo(value);
session.mVolumeProvider.onSetVolumeTo(value);
}
} }
} }
@@ -1138,6 +1146,8 @@ public final class MediaSession {
private static final int MSG_CUSTOM_ACTION = 13; private static final int MSG_CUSTOM_ACTION = 13;
private static final int MSG_MEDIA_BUTTON = 14; private static final int MSG_MEDIA_BUTTON = 14;
private static final int MSG_COMMAND = 15; private static final int MSG_COMMAND = 15;
private static final int MSG_ADJUST_VOLUME = 16;
private static final int MSG_SET_VOLUME = 17;
private MediaSession.Callback mCallback; private MediaSession.Callback mCallback;
@@ -1166,6 +1176,7 @@ public final class MediaSession {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
VolumeProvider vp;
switch (msg.what) { switch (msg.what) {
case MSG_PLAY: case MSG_PLAY:
mCallback.onPlay(); mCallback.onPlay();
@@ -1213,6 +1224,22 @@ public final class MediaSession {
Command cmd = (Command) msg.obj; Command cmd = (Command) msg.obj;
mCallback.onCommand(cmd.command, cmd.extras, cmd.stub); mCallback.onCommand(cmd.command, cmd.extras, cmd.stub);
break; break;
case MSG_ADJUST_VOLUME:
synchronized (mLock) {
vp = mVolumeProvider;
}
if (vp != null) {
vp.onAdjustVolume((int) msg.obj);
}
break;
case MSG_SET_VOLUME:
synchronized (mLock) {
vp = mVolumeProvider;
}
if (vp != null) {
vp.onSetVolumeTo((int) msg.obj);
}
break;
} }
} }
} }