From 15986c66cb04608f21f70ccd6e9d0bfc390f55c7 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Thu, 28 Jun 2012 13:38:28 -0400 Subject: Fix #6750492: NPE in tablet status bar Pull down a bugfix from BaseStatusBar. Bug: 6750492 Change-Id: I9bd04e3a800d4dd2222844d2848208d611b60fe0 --- .../src/com/android/systemui/statusbar/tablet/TabletStatusBar.java | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index 5cab636..f947369 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -1658,6 +1658,7 @@ public class TabletStatusBar extends BaseStatusBar implements @Override protected boolean isTopNotification(ViewGroup parent, NotificationData.Entry entry) { + if (parent == null || entry == null) return false; return parent.indexOfChild(entry.row) == parent.getChildCount()-1; } -- cgit v1.1