Merge "Protect against crash while sysui is initing"

2017-03-09 17:36:56 +00:00
parent acddd2c2ae 9f1422d04a
commit 70c8e86808
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
@@ -175,7 +175,8 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
            View view = mQs.getView();
            if (count < mNumQuickTiles && mAllowFancy) {
                // Quick tiles.
-                com.android.systemui.plugins.qs.QSTileView quickTileView = mQuickQsPanel.getTileView(tile);
+                QSTileView quickTileView = mQuickQsPanel.getTileView(tile);
+                if (quickTileView == null) continue;

                lastX = loc1[0];
                getRelativePosition(loc1, quickTileView.getIcon().getIconView(), view);