Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b06307d5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [9592009] into qt-qpr2-release 

Change-Id: I2a07dd5c046e88fc4f34ffbb345b62c69b8d8c4d
parents 3d43f56f 0cfacf2d

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

+2 −2
Original line number Diff line number Diff line
@@ -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);