summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorRoboErik <epastern@google.com>2014-10-03 21:33:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-03 21:33:05 +0000
commit49c14438fd1838851726fad1bb595bfb95764b4c (patch)
treedc4b835cd5a7c0652b57874320e1b8ff628b533a /media
parent33ecc6e0fca154993ffab053f33296537adfb510 (diff)
parent2d553e95c9e16fd37a676acaf1960e9d919c3caf (diff)
downloadframeworks_base-49c14438fd1838851726fad1bb595bfb95764b4c.zip
frameworks_base-49c14438fd1838851726fad1bb595bfb95764b4c.tar.gz
frameworks_base-49c14438fd1838851726fad1bb595bfb95764b4c.tar.bz2
am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev
* commit '2d553e95c9e16fd37a676acaf1960e9d919c3caf': Fix regression in RCC.editMetadata(false)
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/RemoteControlClient.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java
index 3c2ad0e..0336f11 100644
--- a/media/java/android/media/RemoteControlClient.java
+++ b/media/java/android/media/RemoteControlClient.java
@@ -572,7 +572,8 @@ import java.lang.IllegalArgumentException;
// USE_SESSIONS
if (mSession != null && mMetadataBuilder != null) {
- mSession.setMetadata(mMetadataBuilder.build());
+ mMediaMetadata = mMetadataBuilder.build();
+ mSession.setMetadata(mMediaMetadata);
}
mApplied = true;
}