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

dsandler · Android (Google) Code Review · commit 9a8a28aa72b9 · 2012-06-28T11:02:57.000-07:00
diff --git 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 void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
 
     @Override
     protected boolean isTopNotification(ViewGroup parent, NotificationData.Entry entry) {
+        if (parent == null || entry == null) return false;
         return parent.indexOfChild(entry.row) == parent.getChildCount()-1;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1658,6 +1658,7 @@ public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {`
`1658`	`1658`
`1659`	`1659`	`@Override`
`1660`	`1660`	`protected boolean isTopNotification(ViewGroup parent, NotificationData.Entry entry) {`
	`1661`	`+ if (parent == null \|\| entry == null) return false;`
`1661`	`1662`	`return parent.indexOfChild(entry.row) == parent.getChildCount()-1;`
`1662`	`1663`	`}`
`1663`	`1664`