From fa7614dfd4f73a32ea281597d4657c67d261e8ec Mon Sep 17 00:00:00 2001
From: Alison Cichowlas <asc@google.com>
Date: Wed, 9 May 2018 19:35:11 -0400
Subject: [PATCH] Set static Dependency ref after all the Deps are set up.

Test: atest SystemUITests
Bug: 79444334
Change-Id: I1a0cb5a25f4cf13b876a9cad66fc74f82ebdc143
---
 packages/SystemUI/src/com/android/systemui/Dependency.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index beb3c5398780a..9c9f0218d74f1 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