summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author RoboErik <epastern@google.com> 2014-10-03 21:52:37 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-10-03 21:52:37 +0000
commit64cb3ec43209e61a63b79a227cd00f848ef1bddb (patch)
tree89faa82652f428b960fdab32775f77fedac3eedf
parent24c192b87ff7b90ce4bc7568561a230c587a4fdf (diff)
parent26c2e5a0de022e3842e65337550214c7133aa08b (diff)
am 26c2e5a0: am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev
* commit '26c2e5a0de022e3842e65337550214c7133aa08b': Fix regression in RCC.editMetadata(false)
-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 3c2ad0ee9c0d..0336f11fae0f 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;
}