Remove user data from Android incognito media notifications.

Android notifications are stored in Android logs. User data are removed
from media notifications in incognito mode to avoid leaking this data.
The change is behind a disabled by default switch and is previously
reviewed in: crrev.com/c/586868

Bug: 629887
Change-Id: Icbe2ba7b7b670e59f78dd53e282bc326631c9a9c
Reviewed-on: https://chromium-review.googlesource.com/c/1196367
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596541}

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

@@ -42,6 +42,7 @@ import org.chromium.base.VisibleForTesting;
 import org.chromium.blink.mojom.MediaSessionAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.AppHooks;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;
 import org.chromium.chrome.browser.notifications.NotificationBuilderFactory;
 import org.chromium.chrome.browser.notifications.NotificationConstants;
@@ -1070,11 +1071,15 @@ public class MediaNotificationManager {
 
     private void setMediaStyleLayoutForNotificationBuilder(ChromeNotificationBuilder builder) {
         setMediaStyleNotificationText(builder);
+        // Notifications in incognito shouldn't show an icon to avoid leaking information.
+        boolean hideUserData = mMediaNotificationInfo.isPrivate
+                && ChromeFeatureList.isEnabled(
+                           ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
         if (!mMediaNotificationInfo.supportsPlayPause()) {
             // Non-playback (Cast) notification will not use MediaStyle, so not
             // setting the large icon is fine.
             builder.setLargeIcon(null);
-        } else if (mMediaNotificationInfo.notificationLargeIcon != null) {
+        } else if (mMediaNotificationInfo.notificationLargeIcon != null && !hideUserData) {
             builder.setLargeIcon(mMediaNotificationInfo.notificationLargeIcon);
         } else if (!isRunningAtLeastN()) {
             if (mDefaultNotificationLargeIcon == null
@@ -1133,6 +1138,21 @@ public class MediaNotificationManager {
     }
 
     private void setMediaStyleNotificationText(ChromeNotificationBuilder builder) {
+        boolean hideUserData = mMediaNotificationInfo.isPrivate
+                && ChromeFeatureList.isEnabled(
+                           ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
+        if (hideUserData) {
+            // Notifications in incognito shouldn't show what is playing to avoid leaking
+            // information.
+            builder.setContentTitle(
+                    getContext().getResources().getString(R.string.media_notification_incognito));
+            if (isRunningAtLeastN()) {
+                builder.setSubText(
+                        getContext().getResources().getString(R.string.notification_incognito_tab));
+            }
+            return;
+        }
+
         builder.setContentTitle(mMediaNotificationInfo.metadata.getTitle());
         String artistAndAlbumText = getArtistAndAlbumText(mMediaNotificationInfo.metadata);
         if (isRunningAtLeastN() || !artistAndAlbumText.isEmpty()) {

chrome/android/java/strings/android_chrome_strings.grd

@@ -3309,6 +3309,12 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_MEDIA_NOTIFICATION_LINK_TEXT" desc="Url of the current tab. The notification will display this text for the user to identify the tab to return to.">
         Touch to return to <ph name="URL_OF_THE_CURRENT_TAB">%1$s<ex>https://apprtc.appspot.com</ex></ph>
       </message>
+      <message name="IDS_MEDIA_NOTIFICATION_INCOGNITO" desc="Text used as a placeholder for media notifications content, when notification is shown from incognito tab.">
+        A site is playing media
+      </message>
+      <message name="IDS_NOTIFICATION_INCOGNITO_TAB" desc="Text used as notifications source when the notification is from incognito tabs.">
+        Incognito tab
+      </message>
       <message name="IDS_SCREEN_CAPTURE_NOTIFICATION_TEXT" desc="Text to be shown as a notification when screen capture is in progress.">
         <ph name="URL_OF_THE_CURRENT_TAB">%1$s<ex>https://apprtc.appspot.com</ex></ph> is sharing your screen
       </message>

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java

@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.media.ui;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -24,6 +25,7 @@ import org.robolectric.shadows.ShadowNotification;
 
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.content_public.common.MediaMetadata;
 
 /**
@@ -48,11 +50,23 @@ public class MediaNotificationManagerNotificationTest extends MediaNotificationM
 
         ShadowNotification shadowNotification = Shadows.shadowOf(notification);
 
-        assertEquals("title", shadowNotification.getContentTitle());
-        assertEquals("artist - album", shadowNotification.getContentText());
-        if (hasNApis()) {
-            assertEquals("https://example.com/",
-                    notification.extras.getString(Notification.EXTRA_SUB_TEXT));
+        boolean userDataIsHidden = info.isPrivate
+                && ChromeFeatureList.isEnabled(
+                           ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
+        if (userDataIsHidden) {
+            assertNotEquals("title", shadowNotification.getContentTitle());
+            assertNotEquals("artist - album", shadowNotification.getContentText());
+            if (hasNApis()) {
+                assertNull(notification.extras.getString(Notification.EXTRA_SUB_TEXT));
+            }
+        } else {
+            assertEquals("title", shadowNotification.getContentTitle());
+            assertEquals("artist - album", shadowNotification.getContentText());
+
+            if (hasNApis()) {
+                assertEquals("https://example.com/",
+                        notification.extras.getString(Notification.EXTRA_SUB_TEXT));
+            }
         }
     }
 
@@ -68,8 +82,16 @@ public class MediaNotificationManagerNotificationTest extends MediaNotificationM
 
         ShadowNotification shadowNotification = Shadows.shadowOf(notification);
 
-        assertEquals(info.metadata.getTitle(), shadowNotification.getContentTitle());
-        assertEquals(info.origin, shadowNotification.getContentText());
+        boolean userDataIsHidden = info.isPrivate
+                && ChromeFeatureList.isEnabled(
+                           ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
+        if (userDataIsHidden) {
+            assertNotEquals(info.metadata.getTitle(), shadowNotification.getContentTitle());
+            assertNull(shadowNotification.getContentText());
+        } else {
+            assertEquals(info.metadata.getTitle(), shadowNotification.getContentTitle());
+            assertEquals(info.origin, shadowNotification.getContentText());
+        }
         if (hasNApis()) {
             assertEquals(null, notification.extras.getString(Notification.EXTRA_SUB_TEXT));
         }
@@ -87,10 +109,23 @@ public class MediaNotificationManagerNotificationTest extends MediaNotificationM
 
         ShadowNotification shadowNotification = Shadows.shadowOf(notification);
 
-        assertEquals(info.metadata.getTitle(), shadowNotification.getContentTitle());
-        assertEquals("", shadowNotification.getContentText());
-        if (hasNApis()) {
-            assertEquals(info.origin, notification.extras.getString(Notification.EXTRA_SUB_TEXT));
+        boolean userDataIsHidden = info.isPrivate
+                && ChromeFeatureList.isEnabled(
+                           ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
+        if (userDataIsHidden) {
+            assertNotEquals(info.metadata.getTitle(), shadowNotification.getContentTitle());
+            assertNull(shadowNotification.getContentText());
+            if (hasNApis()) {
+                assertNotEquals(
+                        info.origin, notification.extras.getString(Notification.EXTRA_SUB_TEXT));
+            }
+        } else {
+            assertEquals(info.metadata.getTitle(), shadowNotification.getContentTitle());
+            assertEquals("", shadowNotification.getContentText());
+            if (hasNApis()) {
+                assertEquals(
+                        info.origin, notification.extras.getString(Notification.EXTRA_SUB_TEXT));
+            }
         }
     }
 
@@ -103,7 +138,14 @@ public class MediaNotificationManagerNotificationTest extends MediaNotificationM
         Notification notification = updateNotificationBuilderAndBuild(info);
 
         if (hasNApis()) {
-            assertTrue(largeIcon.sameAs(iconToBitmap(notification.getLargeIcon())));
+            boolean userDataIsHidden = info.isPrivate
+                    && ChromeFeatureList.isEnabled(
+                               ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
+            if (userDataIsHidden) {
+                assertNull(notification.getLargeIcon());
+            } else {
+                assertTrue(largeIcon.sameAs(iconToBitmap(notification.getLargeIcon())));
+            }
         }
     }
 

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java

@@ -35,10 +35,13 @@ import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.AppHooksImpl;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.media.ui.MediaNotificationManager.ListenerService;
 import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
 import org.chromium.content_public.common.MediaMetadata;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -137,6 +140,11 @@ public class MediaNotificationManagerTestBase {
 
         // Init the command line to avoid assertion failure in |SysUtils#isLowEndDevice()|.
         CommandLine.init(null);
+        // Init ChromeFeaturesList to avoid assertion failure in
+        // MediaNotificationManagerNotificationTest.
+        Map<String, Boolean> testFeatures = new HashMap<>();
+        testFeatures.put(ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS, true);
+        ChromeFeatureList.setTestFeatures(testFeatures);
     }
 
     @After