commit e9c5f9625d988edd48703fb208a20ae2c0bfefbe
author Heemin Seog <hseog@google.com> Sat Oct 19 16:18:38 2019 -0700
committer Heemin Seog <hseog@google.com> Mon Oct 21 17:57:49 2019 +0000
tree aba3132a4c61330b72d0b648bdf95f9404d33a57
parent 305a6bd1d922857ac22c4085ddb1c66b113785fc

DO NOT MERGE Remove use of Dependency in SliceProvider

SliceProviders seem to be created before onCreate is called on the
application which causes some issues with using Dependency in Car System
UI.

Bug: 142974942
Test: manual for car sys ui and atest KeyguardSliceProviderTest on sdk_gphone_x86 emulator
Change-Id: I18d14d51c6b0b3219923b640d9f2145ed9b02b94

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java
index 5795dcc..e408745 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java
@@ -49,7 +49,6 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.keyguard.KeyguardUpdateMonitor;
 import com.android.keyguard.KeyguardUpdateMonitorCallback;
-import com.android.systemui.Dependency;
 import com.android.systemui.R;
 import com.android.systemui.plugins.statusbar.StatusBarStateController;
 import com.android.systemui.statusbar.NotificationMediaManager;
@@ -59,6 +58,7 @@
 import com.android.systemui.statusbar.policy.NextAlarmController;
 import com.android.systemui.statusbar.policy.NextAlarmControllerImpl;
 import com.android.systemui.statusbar.policy.ZenModeController;
+import com.android.systemui.statusbar.policy.ZenModeControllerImpl;
 import com.android.systemui.util.wakelock.SettableWakeLock;
 import com.android.systemui.util.wakelock.WakeLock;
 
@@ -316,7 +316,7 @@
             mContentResolver = getContext().getContentResolver();
             mNextAlarmController = new NextAlarmControllerImpl(getContext());
             mNextAlarmController.addCallback(this);
-            mZenModeController = Dependency.get(ZenModeController.class);
+            mZenModeController = new ZenModeControllerImpl(getContext(), mHandler);
             mZenModeController.addCallback(this);
             mDatePattern = getContext().getString(R.string.system_ui_aod_date_pattern);
             mPendingIntent = PendingIntent.getActivity(getContext(), 0, new Intent(), 0);