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

Commit d5612408 authored by Charles He's avatar Charles He Committed by android-build-merger
Browse files

Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev am: c619ad77 

am: 3ae7bacf

Change-Id: I6c0e42bc214d68628e65ea2c90852b282f935690
parents 10b7b9e9 3ae7bacf

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

+5 −4
Original line number Diff line number Diff line
@@ -53,15 +53,16 @@ import java.util.ArrayList; 
public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {



    // The index of the array is isStrongAuth << 2 + isProfile << 1 + isAlpha.

    // TODO(b/36511626): add back special strings for strong auth.

    private static final int[] DETAIL_TEXTS = new int[] {

        R.string.lockpassword_confirm_your_pin_generic,

        R.string.lockpassword_confirm_your_password_generic,

        R.string.lockpassword_confirm_your_pin_generic_profile,

        R.string.lockpassword_confirm_your_password_generic_profile,

        R.string.lockpassword_strong_auth_required_reason_restart_device_pin,

        R.string.lockpassword_strong_auth_required_reason_restart_device_password,

        R.string.lockpassword_strong_auth_required_reason_restart_work_pin,

        R.string.lockpassword_strong_auth_required_reason_restart_work_password,

        R.string.lockpassword_confirm_your_pin_generic,

        R.string.lockpassword_confirm_your_password_generic,

        R.string.lockpassword_confirm_your_pin_generic_profile,

        R.string.lockpassword_confirm_your_password_generic_profile,

    };



    public static class InternalActivity extends ConfirmLockPassword {

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

+3 −7
Original line number Diff line number Diff line
@@ -243,15 +243,11 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
        }



        private int getDefaultDetails() {

            boolean isStrongAuthRequired = isStrongAuthRequired();

            // TODO(b/36511626): add back special strings for strong auth.

            if (UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId)) {

                return isStrongAuthRequired

                        ? R.string.lockpassword_strong_auth_required_reason_restart_work_pattern

                        : R.string.lockpassword_confirm_your_pattern_generic_profile;

                return R.string.lockpassword_confirm_your_pattern_generic_profile;

            } else {

                return isStrongAuthRequired

                        ? R.string.lockpassword_strong_auth_required_reason_restart_device_pattern

                        : R.string.lockpassword_confirm_your_pattern_generic;

                return R.string.lockpassword_confirm_your_pattern_generic;

            }

        }