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

Commit b60a1914 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101

Bug: 218500036
Change-Id: I2ac12543fec1ebc38966523c047a172c66fb6eb6
Merged-In: I7c8714a177bc85fbce92f6e8fe911f74ca2ac243
parents e929052d 1e7087f1

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

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.view.SurfaceView; 
import android.view.ViewGroup;



import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.keyguard.dagger.KeyguardBouncerScope;

import com.android.systemui.dagger.qualifiers.Main;
@@ -208,7 +209,7 @@ public class AdminSecondaryLockScreenController { 
            hide();

            if (mKeyguardCallback != null) {

                mKeyguardCallback.dismiss(/* securityVerified= */ true, userId,

                        /* bypassSecondaryLockScreen= */true);

                        /* bypassSecondaryLockScreen= */true, SecurityMode.Invalid);

            }

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
            if (dismissKeyguard) {

                mDismissing = true;

                mLatencyTracker.onActionStart(LatencyTracker.ACTION_LOCKSCREEN_UNLOCK);

                getKeyguardSecurityCallback().dismiss(true, userId);

                getKeyguardSecurityCallback().dismiss(true, userId, getSecurityMode());

            }

        } else {

            if (isValidPassword) {

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

+8 −7
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView> 
                                Log.i(TAG, "TrustAgent dismissed Keyguard.");

                            }

                            mSecurityCallback.dismiss(false /* authenticated */, userId,

                                    /* bypassSecondaryLockScreen */ false);

                                    /* bypassSecondaryLockScreen */ false, SecurityMode.Invalid);

                        } else {

                            mViewMediatorCallback.playTrustedSound();

                        }
@@ -105,9 +105,9 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView> 


        @Override

        public boolean dismiss(boolean authenticated, int targetUserId,

                boolean bypassSecondaryLockScreen) {

                boolean bypassSecondaryLockScreen, SecurityMode expectedSecurityMode) {

            return mKeyguardSecurityContainerController.showNextSecurityScreenOrFinish(

                    authenticated, targetUserId, bypassSecondaryLockScreen);

                    authenticated, targetUserId, bypassSecondaryLockScreen, expectedSecurityMode);

        }



        @Override
@@ -215,7 +215,8 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView> 
     * @return True if the keyguard is done.

     */

    public boolean dismiss(int targetUserId) {

        return mSecurityCallback.dismiss(false, targetUserId, false);

        return mSecurityCallback.dismiss(false, targetUserId, false,

                getCurrentSecurityMode());

    }



    /**
@@ -352,10 +353,10 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView> 
    }



    public boolean handleBackKey() {

        if (mKeyguardSecurityContainerController.getCurrentSecurityMode()

                != SecurityMode.None) {

        SecurityMode securityMode = mKeyguardSecurityContainerController.getCurrentSecurityMode();

        if (securityMode != SecurityMode.None) {

            mKeyguardSecurityContainerController.dismiss(

                    false, KeyguardUpdateMonitor.getCurrentUser());

                    false, KeyguardUpdateMonitor.getCurrentUser(), securityMode);

            return true;

        }

        return false;

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

+3 −2
Original line number Diff line number Diff line
@@ -58,10 +58,11 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
            return false;

        }

        @Override

        public void dismiss(boolean securityVerified, int targetUserId) { }

        public void dismiss(boolean securityVerified, int targetUserId,

                SecurityMode expectedSecurityMode) { }

        @Override

        public void dismiss(boolean authenticated, int targetId,

                boolean bypassSecondaryLockScreen) { }

                boolean bypassSecondaryLockScreen, SecurityMode expectedSecurityMode) { }

        @Override

        public void onUserInput() { }

        @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ public class KeyguardPatternViewController 
                if (dismissKeyguard) {

                    mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Correct);

                    mLatencyTracker.onActionStart(LatencyTracker.ACTION_LOCKSCREEN_UNLOCK);

                    getKeyguardSecurityCallback().dismiss(true, userId);

                    getKeyguardSecurityCallback().dismiss(true, userId, SecurityMode.Pattern);

                }

            } else {

                mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);