summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorRoboErik <epastern@google.com>2014-08-25 20:20:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-25 20:20:54 +0000
commitcc3e5d5cd197ad45e051e31fd85af28588af4cf7 (patch)
tree9dec50000e585e47ac1ec15c85f6f428e0ffc3d5 /media
parentfaa9fb8b6acce28c8edf0ebc84043e2ca6e41d7d (diff)
parent7e2b3008f11cae295c84d20f32d731e1d379562f (diff)
downloadframeworks_base-cc3e5d5cd197ad45e051e31fd85af28588af4cf7.zip
frameworks_base-cc3e5d5cd197ad45e051e31fd85af28588af4cf7.tar.gz
frameworks_base-cc3e5d5cd197ad45e051e31fd85af28588af4cf7.tar.bz2
Merge "Ensure current volume is current" into lmp-dev
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/session/MediaSession.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index eac6809..1670097 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -290,6 +290,7 @@ public final class MediaSession {
try {
mBinder.setPlaybackToRemote(volumeProvider.getVolumeControl(),
volumeProvider.getMaxVolume());
+ mBinder.setCurrentVolume(volumeProvider.onGetCurrentVolume());
} catch (RemoteException e) {
Log.wtf(TAG, "Failure in setPlaybackToRemote.", e);
}