commit 5db2f16f15549c490c9541602a96f42bef984acb
author Rubin Xu <rubinxu@google.com> Tue Feb 16 16:12:44 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 16 16:12:45 2016 +0000
tree e80295f59570ec10b3b21bae58ae9a5e35ce8216
parent ce3f338040894f23cdea7ac2f9e9e14a58fd15a3
parent cedcd28103c29e8644f7555a9bd835d081c7ae8e

Merge "Initialize mTiles before constructing AutoTileManager" into nyc-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
index da2c20d..2af2009 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
@@ -147,8 +147,9 @@
 
         mServices = new TileServices(this, mLooper);
 
-        mAutoTiles = new AutoTileManager(context, this);
         TunerService.get(mContext).addTunable(this, TILES_SETTING);
+        // AutoTileManager can modify mTiles so make sure mTiles has already been initialized.
+        mAutoTiles = new AutoTileManager(context, this);
     }
 
     public void setHeaderView(View view) {