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

Commit 8833d1eb authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Fix bouncer race condition 

Bouncer would get stuck if authentication method changed after view
inflation.

Bug: 149773776
Bug: 149828540
Test: atest PlatformScenarioTests:android.platform.test.scenario.sysui.lockscreen.LockscreenWithInvalidPIN
Change-Id: I39ee2ec2e2ba9b6cf7dfba6b8141efc8b380b48e
parent 28a0b857

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+6 −8
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL; 
import static android.view.ViewRootImpl.sNewInsetsMode;

import static android.view.WindowInsets.Type.ime;

import static android.view.WindowInsets.Type.systemBars;



import static com.android.systemui.DejankUtils.whitelistIpcs;



import static java.lang.Integer.max;



import android.app.Activity;
@@ -28,7 +30,6 @@ import android.app.admin.DevicePolicyManager; 
import android.content.Context;

import android.content.Intent;

import android.content.res.ColorStateList;

import android.graphics.Rect;

import android.metrics.LogMaker;

import android.os.Handler;

import android.os.Looper;
@@ -511,6 +512,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe 
        boolean finish = false;

        boolean strongAuth = false;

        int eventSubtype = -1;

        mCurrentSecuritySelection = whitelistIpcs(() ->

                mSecurityModel.getSecurityMode(targetUserId));

        if (mUpdateMonitor.getUserHasTrust(targetUserId)) {

            finish = true;

            eventSubtype = BOUNCER_DISMISS_EXTENDED_ACCESS;
@@ -518,13 +521,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe 
            finish = true;

            eventSubtype = BOUNCER_DISMISS_BIOMETRIC;

        } else if (SecurityMode.None == mCurrentSecuritySelection) {

            SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);

            if (SecurityMode.None == securityMode) {

            finish = true; // no security required

            eventSubtype = BOUNCER_DISMISS_NONE_SECURITY;

            } else {

                showSecurityScreen(securityMode); // switch to the alternate security view

            }

        } else if (authenticated) {

            switch (mCurrentSecuritySelection) {

                case Pattern: