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

Commit 725a9a5f authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Show msg in bouncer on weak biometric timeout 

Show "PIN/pattern/password required for additional security"
on the bouncer when primary auth is required due to
STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT.

Previously, the strongAuth reason wasn't mapped to any prompt
reason string.

Test: manual
Bug: 204254599
Change-Id: I879a13233738f7ca5e7e29657b2070025cd3dd98
parent 471b0fba

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

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.view.WindowInsets.Type.ime; 


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

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

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

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;
@@ -101,6 +102,8 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView { 
                return R.string.kg_prompt_reason_user_request;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                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_NONE:

                return 0;

            default:

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

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

                mMessageAreaController.setMessage(R.string.kg_prompt_reason_timeout_pattern);

                break;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                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
@@ -18,6 +18,7 @@ package com.android.keyguard; 


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

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

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

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;
@@ -113,6 +114,8 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 
                return R.string.kg_prompt_reason_user_request;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                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_NONE:

                return 0;

            default: