commit c29c2020a0f3667ffab0828e7cc451c46ca0ab6d
author Jason Monk <jmonk@google.com> Thu Jan 03 16:52:37 2019 -0500
committer Jason Monk <jmonk@google.com> Thu Jan 03 16:52:37 2019 -0500
tree 7947aff71e4e6f5d8f50f062763bdc51115a5104
parent 7ee09966e2649a2ab122ef577586e82f40085202

Fix tuner crash from dependencies

Test: atest SystemUITests
Change-Id: I530ac3fa5d7dc2a044feab81de9587a21a3bcef7
Fixes: 122320435

packages/SystemUI/src/com/android/systemui/Dependency.java

diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index 08fa434..30c92daf 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -512,6 +512,9 @@
     public static void initDependencies(Context context) {
         if (sDependency != null) return;
         Dependency d = new Dependency();
+        SystemUIFactory.getInstance().getRootComponent()
+                .createDependency()
+                .createSystemUI(d);
         d.mContext = context;
         d.mComponents = new HashMap<>();
         d.start();

packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java

diff --git a/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java b/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java
index 3426e11..61bfa75 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java
@@ -69,4 +69,10 @@
         mDependency.onConfigurationChanged(null);
         verify(d).onConfigurationChanged(eq(null));
     }
+
+    @Test
+    public void testInitDependency() {
+        Dependency.clearDependencies();
+        Dependency.initDependencies(mContext);
+    }
 }