Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev

RoboErikG · Android (Google) Code Review · commit 7a60cdbd0989 · 2014-10-03T20:13:28.000Z
diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java
@@ -572,7 +572,8 @@ public synchronized void apply() {
 
                 // USE_SESSIONS
                 if (mSession != null && mMetadataBuilder != null) {
-                    mSession.setMetadata(mMetadataBuilder.build());
+                    mMediaMetadata = mMetadataBuilder.build();
+                    mSession.setMetadata(mMediaMetadata);
                 }
                 mApplied = true;
             }

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,8 @@ public synchronized void apply() {`
`572`	`572`
`573`	`573`	`// USE_SESSIONS`
`574`	`574`	`if (mSession != null && mMetadataBuilder != null) {`
`575`		`- mSession.setMetadata(mMetadataBuilder.build());`
	`575`	`+ mMediaMetadata = mMetadataBuilder.build();`
	`576`	`+ mSession.setMetadata(mMediaMetadata);`
`576`	`577`	`}`
`577`	`578`	`mApplied = true;`
`578`	`579`	`}`