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

Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev

Browse Source
This commit is contained in:
Selim Cinek
2016-05-09 23:19:27 +00:00
committed by Android (Google) Code Review
parent 3b25fd081d 06416b9e57
commit 3e04c56432
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -2184,9 +2184,8 @@ public abstract class BaseStatusBar extends SystemUI implements
== View.VISIBLE; == View.VISIBLE;
boolean showOnKeyguard = shouldShowOnKeyguard(entry.notification); boolean showOnKeyguard = shouldShowOnKeyguard(entry.notification);
if (suppressedSummary || (isLockscreenPublicMode() && !mShowLockscreenNotifications) || if (suppressedSummary || (isLockscreenPublicMode() && !mShowLockscreenNotifications) ||
(onKeyguard && (visibleNotifications >= maxNotifications (onKeyguard && !childWithVisibleSummary
&& !childWithVisibleSummary && (visibleNotifications >= maxNotifications || !showOnKeyguard))) {
|| !showOnKeyguard))) {
entry.row.setVisibility(View.GONE); entry.row.setVisibility(View.GONE);
if (onKeyguard && showOnKeyguard && !childNotification && !suppressedSummary) { if (onKeyguard && showOnKeyguard && !childNotification && !suppressedSummary) {
mKeyguardIconOverflowContainer.getIconsView().addNotification(entry); mKeyguardIconOverflowContainer.getIconsView().addNotification(entry);

5
packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
View File

@@ -823,11 +823,6 @@ public class StackStateAnimator {
// The position for this child was never generated, let's continue. // The position for this child was never generated, let's continue.
continue; continue;
} }
if (changingView.getVisibility() == View.GONE) {
// The view was set to gone but the state never removed
finalState.removeViewStateForView(changingView);
continue;
}
finalState.applyState(changingView, viewState); finalState.applyState(changingView, viewState);
mNewAddChildren.add(changingView); mNewAddChildren.add(changingView);