| commit | e5ec413c13fbfeb9eafbaa5340aca6ff6c809cc4 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Fri Jun 17 20:04:16 2016 -0700 |
| committer | Selim Cinek <cinek@google.com> | Fri Jun 17 20:04:16 2016 -0700 |
| tree | 881e53e3790bf656432dc2c897c5d040edc61ad8 | |
| parent | a554c707386eb8a6c6fb3a2399f23b79a1c17f74 [diff] |
Fixed a bug where a notification was incorrectly marked as removed When unauto-bundled, it could lead to serious bugs on the lockscreen and the header not being restored. Change-Id: I2d6310a2bcb2f3a60402db5f1e522954f8bd0389 Fixes: 29463339
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index 2088140..b864a0e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -761,9 +761,6 @@ mRemoved = true; mPrivateLayout.setRemoved(); - if (mChildrenContainer != null) { - mChildrenContainer.setRemoved(); - } } public NotificationChildrenContainer getChildrenContainer() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java index ba191cd..3c9373b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
@@ -856,14 +856,6 @@ mNotificationParent.getNotificationColor()); } - public void setRemoved() { - int childCount = mChildren.size(); - for (int i = 0; i < childCount; i++) { - ExpandableNotificationRow child = mChildren.get(i); - child.setRemoved(); - } - } - public int getPositionInLinearLayout(View childInGroup) { int position = mNotificationHeaderMargin + mNotificatonTopPadding;