From 9f1422d04a9ccef9ebeec65b42e9684672b3052a Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 8 Mar 2017 09:11:51 -0500 Subject: Protect against crash while sysui is initing Sometimes when switching users not all the views are there yet, but we will get another layout callback once they are, and can update our animators then. Change-Id: I029839e5c69c8c441cf89b0536a90e223dc35180 Fixes: 35949496 Test: Switch users --- packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java index 3337090fcd53..a30b03b9a411 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 @@ 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); -- cgit v1.2.3-59-g8ed1b