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

Commit 392bd9d4 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Don't update the alternate bouncer on unlocked change 

That callback happens too early and may cause the alternate
bouncer to hide before the biometric unlock controller
has a chance to act upon the alternate bouncer visible state.

This was initially removed to fix b/289909028 but was mistakenly
brought back (in a merge-conflict resolve).

Fixes: 296178710
Test: manual (use face auth to authenticate from a notification
press on the LS when FP is also enrolled)
Test: atest StatusBarKeyguardViewManagerTest

Change-Id: I243db2619867ed66db0f5c282f3c3c3168af2813
parent 5a9f8801

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+2 −10
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 
import com.android.systemui.unfold.FoldAodAnimationController;

import com.android.systemui.unfold.SysUIUnfoldComponent;



import dagger.Lazy;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.HashSet;
@@ -101,7 +103,6 @@ import java.util.Set; 


import javax.inject.Inject;



import dagger.Lazy;

import kotlinx.coroutines.CoroutineDispatcher;



/**
@@ -450,14 +451,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        }

    }



    private KeyguardStateController.Callback mKeyguardStateControllerCallback =

            new KeyguardStateController.Callback() {

                @Override

                public void onUnlockedChanged() {

                    updateAlternateBouncerShowing(mAlternateBouncerInteractor.maybeHide());

                }

            };



    private void registerListeners() {

        mKeyguardUpdateManager.registerCallback(mUpdateMonitorCallback);

        mStatusBarStateController.addCallback(this);
@@ -471,7 +464,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            mDockManager.addListener(mDockEventListener);

            mIsDocked = mDockManager.isDocked();

        }

        mKeyguardStateController.addCallback(mKeyguardStateControllerCallback);



        if (mFlags.isEnabled(Flags.KEYGUARD_WM_STATE_REFACTOR)) {

            mShadeViewController.postToView(() ->