diff options
| author | 2016-02-16 16:12:44 +0000 | |
|---|---|---|
| committer | 2016-02-16 16:12:45 +0000 | |
| commit | 5db2f16f15549c490c9541602a96f42bef984acb (patch) | |
| tree | e80295f59570ec10b3b21bae58ae9a5e35ce8216 | |
| parent | ce3f338040894f23cdea7ac2f9e9e14a58fd15a3 (diff) | |
| parent | cedcd28103c29e8644f7555a9bd835d081c7ae8e (diff) | |
Merge "Initialize mTiles before constructing AutoTileManager" into nyc-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 da2c20db6d90..2af2009ac505 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 @@ 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) { |