commit c04cf4baecfdfeaf82c8498203779d594c9b52a4
author Jason Monk <jmonk@google.com> Wed Mar 02 19:48:00 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 02 19:48:01 2016 +0000
tree 851a0597c564a0934c1c43621ceb55bbb3f0c8e1
parent f8d6fa2c5a42b9adaa7a745bc9c9feaeb3800cc3
parent ae5bd0383182a921ea1472a85d27e0bea0209f9b

Merge "Guard against monkey crash" into nyc-dev

packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
index 2c5cb89..8ccf60d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -77,7 +77,9 @@
 
     @Override
     public int getOffsetTop(TileRecord tile) {
-        return ((ViewGroup) tile.tileView.getParent()).getTop() + getTop();
+        final ViewGroup parent = (ViewGroup) tile.tileView.getParent();
+        if (parent == null) return 0;
+        return parent.getTop() + getTop();
     }
 
     @Override