Merge "Fix #6750492: NPE in tablet status bar" into jb-dev

2012-06-28 11:02:57 -07:00
parent e680c72211 15986c66cb
commit 9a8a28aa72
1 changed files with 1 additions and 0 deletions
--- 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;
    }