From 51c07bc0bf338c9dd9d2345fe81d2cd964d680ca Mon Sep 17 00:00:00 2001
From: RoboErik <epastern@google.com>
Date: Fri, 3 Oct 2014 12:45:58 -0700
Subject: [PATCH] Fix regression in RCC.editMetadata(false)

Found a very simple fix. Just set the cached metadata so we have
it to copy over when editMetadata(false) is called.

bug:17796693
Change-Id: Ib27f0c3d28e7f2a3c7d9495697f36c8045e2bcf6
---
 media/java/android/media/RemoteControlClient.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java
index 3c2ad0ee9c0d2..0336f11fae0f7 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;
             }