diff options
| author | Heemin Seog <hseog@google.com> | 2019-10-19 16:18:38 -0700 |
|---|---|---|
| committer | Heemin Seog <hseog@google.com> | 2019-10-21 17:57:49 +0000 |
| commit | e9c5f9625d988edd48703fb208a20ae2c0bfefbe (patch) | |
| tree | aba3132a4c61330b72d0b648bdf95f9404d33a57 | |
| parent | 305a6bd1d922857ac22c4085ddb1c66b113785fc (diff) | |
| download | base-e9c5f9625d988edd48703fb208a20ae2c0bfefbe.tar.gz | |
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
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java index 5795dcce861c..e408745699ed 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 androidx.slice.builders.SliceAction; 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.phone.KeyguardBypassController; 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 @@ public class KeyguardSliceProvider extends SliceProvider implements 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); |