Merge "Guard against monkey crash" into nyc-dev

2016-03-02 19:48:00 +00:00
parent f8d6fa2c5a ae5bd03831
commit c04cf4baec
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -77,7 +77,9 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {

    @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