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

Commit d6eff497 authored by Derek Jedral's avatar Derek Jedral Committed by Automerger Merge Worker
Browse files

Merge "Fix TrustAgent showing unclear string." into tm-qpr-dev am: a20c6a4c 

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



Change-Id: I1007d99c24b9d804a8f196ae7ca855e4ff91cd6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b71722f a20c6a4c

core/java/com/android/internal/widget/LockPatternUtils.java

+8 −1
Original line number Diff line number Diff line
@@ -1522,7 +1522,8 @@ public class LockPatternUtils { 
                        STRONG_AUTH_REQUIRED_AFTER_LOCKOUT,

                        STRONG_AUTH_REQUIRED_AFTER_TIMEOUT,

                        STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN,

                        STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT})

                        STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT,

                        SOME_AUTH_REQUIRED_AFTER_TRUSTAGENT_EXPIRED})

        @Retention(RetentionPolicy.SOURCE)

        public @interface StrongAuthFlags {}
@@ -1574,6 +1575,12 @@ public class LockPatternUtils { 
         */

        public static final int STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT = 0x80;



        /**

         * Some authentication is required because the trustagent either timed out or was disabled

         * manually.

         */

        public static final int SOME_AUTH_REQUIRED_AFTER_TRUSTAGENT_EXPIRED = 0x100;



        /**

         * Strong auth flags that do not prevent biometric methods from being accepted as auth.

         * If any other flags are set, biometric authentication is disabled.

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

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_NON_STRONG 
import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_PREPARE_FOR_UPDATE;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_RESTART;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TIMEOUT;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TRUSTAGENT_EXPIRED;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_USER_REQUEST;



import android.animation.Animator;
@@ -106,6 +107,8 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView { 
                return R.string.kg_prompt_reason_timeout_password;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_password;

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

                return R.string.kg_prompt_reason_timeout_password;

            case PROMPT_REASON_NONE:

                return 0;

            default:

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

+3 −0
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ public class KeyguardPatternViewController 
            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_timeout_pattern);

                break;

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_timeout_pattern);

                break;

            case PROMPT_REASON_NONE:

                break;

            default:

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

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_NON_STRONG 
import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_PREPARE_FOR_UPDATE;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_RESTART;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TIMEOUT;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TRUSTAGENT_EXPIRED;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_USER_REQUEST;



import android.animation.Animator;
@@ -123,6 +124,8 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 
                return R.string.kg_prompt_reason_timeout_pin;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_pin;

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

                return R.string.kg_prompt_reason_timeout_pin;

            case PROMPT_REASON_NONE:

                return 0;

            default:

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

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ public interface KeyguardSecurityView { 
     */

    int PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT = 7;



    /**

     * Some auth is required because the trustagent expired either from timeout or manually by

     * the user

     */

    int PROMPT_REASON_TRUSTAGENT_EXPIRED = 8;



    /**

     * Reset the view and prepare to take input. This should do things like clearing the

     * password or pattern and clear error messages.