summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rubin Xu <rubinxu@google.com> 2016-02-15 14:44:44 +0000
committer Rubin Xu <rubinxu@google.com> 2016-02-15 14:45:42 +0000
commitcedcd28103c29e8644f7555a9bd835d081c7ae8e (patch)
tree4fd30d7c8593abcfdf539e2b358eafbb6d451abf
parent6bdd7cab5a051d0bc1f83fd4973ae1c9988c80de (diff)
Initialize mTiles before constructing AutoTileManager
Bug: 22682394 Change-Id: Ida41d3757b0732a01e9ede92ec8c5d2f8426c6b0
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java3
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) {