summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alison Cichowlas <asc@google.com> 2018-05-09 19:35:11 -0400
committer Alison Cichowlas <asc@google.com> 2018-05-22 17:02:30 -0400
commitfa7614dfd4f73a32ea281597d4657c67d261e8ec (patch)
tree3729b50461a902ce3a8dea592dbcdaf10a348e34
parent97abc762ccbf2118ded90d6e796d3db1666f3e6b (diff)
Set static Dependency ref after all the Deps are set up.
Test: atest SystemUITests Bug: 79444334 Change-Id: I1a0cb5a25f4cf13b876a9cad66fc74f82ebdc143
-rw-r--r--packages/SystemUI/src/com/android/systemui/Dependency.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index beb3c5398780..9c9f0218d74f 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -151,7 +151,6 @@ public class Dependency extends SystemUI {
@Override
public void start() {
- sDependency = this;
// TODO: Think about ways to push these creation rules out of Dependency to cut down
// on imports.
mProviders.put(TIME_TICK_HANDLER, () -> {
@@ -331,6 +330,8 @@ public class Dependency extends SystemUI {
// Put all dependencies above here so the factory can override them if it wants.
SystemUIFactory.getInstance().injectDependencies(mProviders, mContext);
+
+ sDependency = this;
}
@Override