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

Commit 02b52531 authored by Matt Pietal's avatar Matt Pietal
Browse files

[conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8 

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



Change-Id: Ie85c312ad47c5be276010f0a96d64e058be2fbda
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85d0cb31 a30148b8

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

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.KeyEvent; 
import android.view.View;

import android.widget.LinearLayout;



import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.internal.util.LatencyTracker;

import com.android.internal.widget.LockPatternChecker;

import com.android.internal.widget.LockPatternUtils;
@@ -97,6 +98,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 


    protected abstract int getPasswordTextViewId();

    protected abstract void resetState();

    protected abstract SecurityMode getSecurityMode();



    @Override

    protected void onFinishInflate() {
@@ -204,7 +206,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 
            mCallback.reportUnlockAttempt(userId, true, 0);

            if (dismissKeyguard) {

                mDismissing = true;

                mCallback.dismiss(true, userId);

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

            }

        } else {

            if (isValidPassword) {

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

+8 −5
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback { 
                        // the user proved presence via some other way to the trust agent.

                        Log.i(TAG, "TrustAgent dismissed Keyguard.");

                    }

                    dismiss(false /* authenticated */, userId);

                    dismiss(false /* authenticated */, userId, SecurityMode.Invalid);

                } else {

                    mViewMediatorCallback.playTrustedSound();

                }
@@ -188,12 +188,13 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback { 
     * @return True if the keyguard is done.

     */

    public boolean dismiss(int targetUserId) {

        return dismiss(false, targetUserId);

        return dismiss(false, targetUserId, getCurrentSecurityMode());

    }



    public boolean handleBackKey() {

        if (mSecurityContainer.getCurrentSecuritySelection() != SecurityMode.None) {

            mSecurityContainer.dismiss(false, KeyguardUpdateMonitor.getCurrentUser());

            mSecurityContainer.dismiss(false, KeyguardUpdateMonitor.getCurrentUser(),

                getCurrentSecurityMode());

            return true;

        }

        return false;
@@ -204,8 +205,10 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback { 
    }



    @Override

    public boolean dismiss(boolean authenticated, int targetUserId) {

        return mSecurityContainer.showNextSecurityScreenOrFinish(authenticated, targetUserId);

    public boolean dismiss(boolean authenticated, int targetUserId,

            SecurityMode expectedSecurityMode) {

        return mSecurityContainer.showNextSecurityScreenOrFinish(authenticated, targetUserId,

            expectedSecurityMode);

    }



    /**

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

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.animation.AnimationUtils;



import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.settingslib.animation.AppearAnimationUtils;

import com.android.settingslib.animation.DisappearAnimationUtils;

import com.android.systemui.R;
@@ -182,4 +183,9 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
    public boolean hasOverlappingRendering() {

        return false;

    }



    @Override

    public SecurityMode getSecurityMode() {

        return SecurityMode.PIN;

    }

}

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

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.widget.TextView; 
import android.widget.TextView.OnEditorActionListener;



import com.android.internal.widget.TextViewInputDisabler;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.systemui.R;



import java.util.List;
@@ -393,4 +394,9 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView 
        }

        return bytes;

    }



    @Override

    public SecurityMode getSecurityMode() {

        return SecurityMode.Password;

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.internal.util.LatencyTracker; 
import com.android.internal.widget.LockPatternChecker;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternView;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.settingslib.animation.AppearAnimationCreator;

import com.android.settingslib.animation.AppearAnimationUtils;

import com.android.settingslib.animation.DisappearAnimationUtils;
@@ -349,7 +350,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit 
                mCallback.reportUnlockAttempt(userId, true, 0);

                if (dismissKeyguard) {

                    mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Correct);

                    mCallback.dismiss(true, userId);

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

                }

            } else {

                mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);