Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SystemUI: fix notification redaction logic." into oc-dev

Browse Source
This commit is contained in:
Charles He
2017-06-01 07:56:49 +00:00
committed by Android (Google) Code Review
parent 1a3bf132c8 0d9f7d7beb
commit 5f3cab514b
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1826,23 +1826,20 @@ public class StatusBar extends SystemUI implements DemoMode,
// 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());