commit 70c8e868085ca5bb155dfc58b677b26d4b2e4042
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 09 17:36:56 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 09 17:36:59 2017 +0000
tree 45bfc5f856bb290fe674228f663c9a23f7dfda1e
parent acddd2c2ae133952342c8425c0b8415641300a2f
parent 9f1422d04a9ccef9ebeec65b42e9684672b3052a

Merge "Protect against crash while sysui is initing"

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

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
index 3337090..a30b03b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
@@ -175,7 +175,8 @@
             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);