commit | 104be2e0196fec5198b866834d19a26e938d4afc | [log] [tgz] |
---|---|---|
author | Mady Mellor <madym@google.com> | Tue Jun 20 17:18:53 2017 -0700 |
committer | Mady Mellor <madym@google.com> | Wed Jun 28 15:34:36 2017 +0000 |
tree | 379cc08c976880acf6c24027562ef3be83fafcf4 | |
parent | f36a995424b629bcd9bb1c0e65b8e572e01d0dfb [diff] |
If the menu hasn't been created yet don't do things with it Test: runtest systemui Fixes: 62594598 Change-Id: I1050e2b2bf1ece960d19ad13cb6a9bf71512db57 (cherry picked from commit 0b3f004acbb0eef38ee5e8d920e934f7ab2f7cde)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java index c09da21..bd4a1df 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
@@ -417,7 +417,7 @@ @Override public void onHeightUpdate() { - if (mParent == null || mMenuItems.size() == 0) { + if (mParent == null || mMenuItems.size() == 0 || mMenuContainer == null) { return; } int parentHeight = mParent.getCollapsedHeight(); @@ -477,7 +477,7 @@ private void setMenuLocation() { boolean showOnLeft = mTranslation > 0; - if ((mIconsPlaced && showOnLeft == mOnLeft) || mSnapping + if ((mIconsPlaced && showOnLeft == mOnLeft) || mSnapping || mMenuContainer == null || !mMenuContainer.isAttachedToWindow()) { // Do nothing return;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java index e0d8042..4aa9877 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java
@@ -57,4 +57,10 @@ row.createMenu(null); assertTrue(row.getMenuView() != null); } + + @Test + public void testResetUncreatedMenu() { + NotificationMenuRowPlugin row = new NotificationMenuRow(mContext); + row.resetMenu(); + } }