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

Commit a3d24ad9 authored by Ale Nijamkin's avatar Ale Nijamkin
Browse files

[flexiglass] Register KeyguardService callbacks with more classes 

If Flexiglass is enabled, still register it with KeyguardStateCallbackInteractor or with KeyguardViewMediator in addition to KeyguardStateCallbackStartable.

Initially, I thought this would fix b/419895698 but it didn't appear to.
Either way, this is a positive thing to do.

Bug: 419895698
Flag: com.android.systemui.scene_container
Test: not tested
Change-Id: I7c1726c4411abf14dbd7dcd05ad182428e6ea2d3
parent 97370356

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

+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);