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

Commit c619ad77 authored by Charles He's avatar Charles He Committed by Android (Google) Code Review
Browse files

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

parents aaeb09e6 701ac5cb

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

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

public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {





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

    // 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[] {

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

        R.string.lockpassword_confirm_your_pin_generic,

        R.string.lockpassword_confirm_your_pin_generic,

        R.string.lockpassword_confirm_your_password_generic,

        R.string.lockpassword_confirm_your_password_generic,

        R.string.lockpassword_confirm_your_pin_generic_profile,

        R.string.lockpassword_confirm_your_pin_generic_profile,

        R.string.lockpassword_confirm_your_password_generic_profile,

        R.string.lockpassword_confirm_your_password_generic_profile,

        R.string.lockpassword_strong_auth_required_reason_restart_device_pin,

        R.string.lockpassword_confirm_your_pin_generic,

        R.string.lockpassword_strong_auth_required_reason_restart_device_password,

        R.string.lockpassword_confirm_your_password_generic,

        R.string.lockpassword_strong_auth_required_reason_restart_work_pin,

        R.string.lockpassword_confirm_your_pin_generic_profile,

        R.string.lockpassword_strong_auth_required_reason_restart_work_password,

        R.string.lockpassword_confirm_your_password_generic_profile,

    };

    };





    public static class InternalActivity extends ConfirmLockPassword {

    public static class InternalActivity extends ConfirmLockPassword {

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

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

        }





        private int getDefaultDetails() {

        private int getDefaultDetails() {

            boolean isStrongAuthRequired = isStrongAuthRequired();

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

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

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

                return isStrongAuthRequired

                return R.string.lockpassword_confirm_your_pattern_generic_profile;

                        ? R.string.lockpassword_strong_auth_required_reason_restart_work_pattern

                        : R.string.lockpassword_confirm_your_pattern_generic_profile;

            } else {

            } else {

                return isStrongAuthRequired

                return R.string.lockpassword_confirm_your_pattern_generic;

                        ? R.string.lockpassword_strong_auth_required_reason_restart_device_pattern

                        : R.string.lockpassword_confirm_your_pattern_generic;

            }

            }

        }

        }