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

2016-02-16 16:12:44 +00:00
parent ce3f338040 cedcd28103
commit 5db2f16f15
1 changed files with 2 additions and 1 deletions
--- 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 @@ public final class QSTileHost implements QSTile.Host, Tunable {

        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) {