[Settings] Add a verification flow for exiting repair mode
Handles the ACTION_CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL intent to launch the confirm device credential activity for users to exiting repair mode. The activity passes a special user id USER_REPAIR_MODE to the framework and verify credentials that the user enrolled in normal mode. Bug: 277561275 Test: am start -a android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL settings put global repair_mode_active 1 am start -a android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL The credential is verified successfully. Change-Id: I9ffe32f9925ee2b990c49d5674d27196a4c9edf7
This commit is contained in:
@@ -284,6 +284,11 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
|
||||
return mIsAlpha ? getString(R.string.lockpassword_confirm_your_password_header_frp)
|
||||
: getString(R.string.lockpassword_confirm_your_pin_header_frp);
|
||||
}
|
||||
if (mRepairMode) {
|
||||
return mIsAlpha
|
||||
? getString(R.string.lockpassword_confirm_repair_mode_password_header)
|
||||
: getString(R.string.lockpassword_confirm_repair_mode_pin_header);
|
||||
}
|
||||
if (mRemoteValidation) {
|
||||
return getString(R.string.lockpassword_remote_validation_header);
|
||||
}
|
||||
@@ -307,6 +312,11 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
|
||||
return mIsAlpha ? getString(R.string.lockpassword_confirm_your_password_details_frp)
|
||||
: getString(R.string.lockpassword_confirm_your_pin_details_frp);
|
||||
}
|
||||
if (mRepairMode) {
|
||||
return mIsAlpha
|
||||
? getString(R.string.lockpassword_confirm_repair_mode_password_details)
|
||||
: getString(R.string.lockpassword_confirm_repair_mode_pin_details);
|
||||
}
|
||||
if (mRemoteValidation) {
|
||||
return getContext().getString(mIsAlpha
|
||||
? R.string.lockpassword_remote_validation_password_details
|
||||
|
Reference in New Issue
Block a user