commit 211c3a621a21ad7d6d92102df9ce323094c473f4
author Charles He <qiurui@google.com> Sun May 28 16:24:32 2017 +0100
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 01 20:21:34 2017 +0000
tree 8c0549ec1b1bebf84bc0da30f64e161c2abc906b
parent 2fd504a910fabffad6a3f53208ba64ecf4e31d6f

SystemUI: fix notification redaction logic.

Previously, the logic for redacting sensitive notifications is flawed
for apps that have individually overridden the system-wide redaction
setting. Sensitive notifications from such apps are still redacted even
after unlock.

This CL fixes the issue and also simplifies the redaction logic by
taking advantage of the needsRedaction() method.

Bug: 35951989
Test: manual, see bug log
Change-Id: I6b72ed97b3056a93cbe44f54c607c16445f39551
(cherry picked from commit 0d9f7d7bebe3fd08d6879ea3f8f13a153f036761)

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index fba0f5e..24c1928 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -1826,23 +1826,20 @@
                 // temporarily become children if they were isolated before.
                 continue;
             }
-            int vis = ent.notification.getNotification().visibility;
             int userId = ent.notification.getUserId();
 
             // Display public version of the notification if we need to redact.
-            boolean deviceSensitive = (isLockscreenPublicMode(mCurrentUserId)
-                    && !userAllowsPrivateNotificationsInPublic(mCurrentUserId));
-            boolean userSensitive = deviceSensitive || (isLockscreenPublicMode(userId)
-                    && !userAllowsPrivateNotificationsInPublic(userId));
-            boolean sensitiveNote = vis == Notification.VISIBILITY_PRIVATE;
-            boolean sensitivePackage = packageHasVisibilityOverride(ent.notification.getKey());
-            boolean sensitive = (sensitiveNote && userSensitive) || sensitivePackage;
-            boolean showingPublic = sensitive && isLockscreenPublicMode(userId);
-            if (showingPublic) {
+            boolean devicePublic = isLockscreenPublicMode(mCurrentUserId);
+            boolean userPublic = devicePublic || isLockscreenPublicMode(userId);
+            boolean needsRedaction = needsRedaction(ent);
+            boolean sensitive = userPublic && needsRedaction;
+            boolean deviceSensitive = devicePublic
+                    && !userAllowsPrivateNotificationsInPublic(mCurrentUserId);
+            if (sensitive) {
                 updatePublicContentView(ent, ent.notification);
             }
             ent.row.setSensitive(sensitive, deviceSensitive);
-            ent.row.setNeedsRedaction(needsRedaction(ent));
+            ent.row.setNeedsRedaction(needsRedaction);
             if (mGroupManager.isChildInGroupWithSummary(ent.row.getStatusBarNotification())) {
                 ExpandableNotificationRow summary = mGroupManager.getGroupSummary(
                         ent.row.getStatusBarNotification());