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

Commit a8c12b42 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Check user validity before retrying authentication 

When managed profile gets wiped Settings may crash with SecurityException
when trying to retry authentication for no longer valid user.

Test: manually with TestDPC
Bug: 201513984
Change-Id: Ib7309abf89be76fcc1bf756c37c09d6b60c6b95c
parent 07c41906

src/com/android/settings/password/ConfirmDeviceCredentialActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { 
                if (errorCode == BiometricPrompt.BIOMETRIC_ERROR_USER_CANCELED

                        || errorCode == BiometricPrompt.BIOMETRIC_ERROR_CANCELED) {

                    finish();

                } else if (mUserManager.getUserInfo(mUserId) == null) {

                    // This can happen when profile gets wiped due to too many failed auth attempts.

                    Log.i(TAG, "Finishing, user no longer valid: " + mUserId);

                    finish();

                } else {

                    // All other errors go to some version of CC

                    showConfirmCredentials();