[Media>UI] Don't show media metadata on lockscreen in Incognito mode

Zhiqiang Zhang · Zhiqiang Zhang · commit da78931d22bf · 2017-01-24T19:10:19.000Z
Media notification content is marked as private in Incognito mode, so the content is hidden on lockscreen. For the same reason, we shouldn't show the artwork image on lockscreen and wearable devices. BUG=683111 Review-Url: https://codereview.chromium.org/2646793006 Cr-Commit-Position: refs/heads/master@{#445745} (cherry picked from commit 233f53a) Review-Url: https://codereview.chromium.org/2657653002 . Cr-Commit-Position: refs/branch-heads/2987@{#65} Cr-Branched-From: ad51088-refs/heads/master@{#444943}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
@@ -673,7 +673,10 @@ private void hideNotification(int tabId) {
         clearNotification();
     }
 
+    @Nullable
     private MediaMetadataCompat createMetadata() {
+        if (mMediaNotificationInfo.isPrivate) return null;
+
         MediaMetadataCompat.Builder metadataBuilder = new MediaMetadataCompat.Builder();
 
         metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_TITLE,

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,10 @@ private void hideNotification(int tabId) {`
`673`	`673`	`clearNotification();`
`674`	`674`	`}`
`675`	`675`
	`676`	`+ @Nullable`
`676`	`677`	`private MediaMetadataCompat createMetadata() {`
	`678`	`+ if (mMediaNotificationInfo.isPrivate) return null;`
	`679`	`+`
`677`	`680`	`MediaMetadataCompat.Builder metadataBuilder = new MediaMetadataCompat.Builder();`
`678`	`681`
`679`	`682`	`metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_TITLE,`