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

Commit 89d422f6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Register KeyguardService callbacks with more classes" into main

parents d8f15d31 a3d24ad9
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import static android.view.WindowManager.TransitionType;

import android.annotation.NonNull;
import android.app.ActivityManager;
import android.app.ActivityTaskManager;
import android.app.Service;
import android.app.WindowConfiguration;
import android.content.Intent;
@@ -55,8 +54,6 @@ import android.util.RotationUtils;
import android.util.Slog;
import android.view.IRemoteAnimationFinishedCallback;
import android.view.IRemoteAnimationRunner;
import android.view.RemoteAnimationAdapter;
import android.view.RemoteAnimationDefinition;
import android.view.RemoteAnimationTarget;
import android.view.SurfaceControl;
import android.view.WindowManagerPolicyConstants;
@@ -99,7 +96,6 @@ import com.android.systemui.settings.DisplayTracker;
import com.android.wm.shell.shared.CounterRotator;
import com.android.wm.shell.shared.ShellTransitions;
import com.android.wm.shell.shared.TransitionUtil;
import com.android.wm.shell.transition.Transitions;

import dagger.Lazy;

@@ -434,7 +430,9 @@ public class KeyguardService extends Service {
            checkPermission();
            if (SceneContainerFlag.isEnabled()) {
                mKeyguardStateCallbackStartableLazy.get().addCallback(callback);
            } else if (KeyguardWmStateRefactor.isEnabled()) {
            }

            if (KeyguardWmStateRefactor.isEnabled()) {
                mKeyguardStateCallbackInteractor.addCallback(callback);
            } else {
                mKeyguardViewMediator.addStateMonitorCallback(callback);