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

Commit cb407569 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Make sure that external callers cannot pass in the confirm bypass extra" into klp-dev

parents e57248e5 66026773

AndroidManifest.xml

+5 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,6 @@ 


        <!-- Second and third-level settings -->





        <!-- Lock screen settings -->

        <activity android:name="ConfirmLockPattern"/>
@@ -1050,6 +1049,11 @@ 
            </intent-filter>

        </activity>



        <activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:excludeFromRecents="true"

        />



        <activity android:name="ChooseLockPattern" android:exported="false"/>



        <activity android:name="ChooseLockPassword" android:exported="false"

src/com/android/settings/ChooseLockGeneric.java

+8 −2
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ public class ChooseLockGeneric extends PreferenceActivity { 
        return false;

    }



    public static class InternalActivity extends ChooseLockGeneric {

    }



    public static class ChooseLockGenericFragment extends SettingsPreferenceFragment {

        private static final int MIN_PASSWORD_LENGTH = 4;

        private static final String KEY_UNLOCK_BACKUP_INFO = "unlock_backup_info";
@@ -97,7 +100,9 @@ public class ChooseLockGeneric extends PreferenceActivity { 
            // Defaults to needing to confirm credentials

            final boolean confirmCredentials = getActivity().getIntent()

                .getBooleanExtra(CONFIRM_CREDENTIALS, true);

            if (getActivity() instanceof ChooseLockGeneric.InternalActivity) {

                mPasswordConfirmed = !confirmCredentials;

            }



            if (savedInstanceState != null) {

                mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
@@ -341,7 +346,8 @@ public class ChooseLockGeneric extends PreferenceActivity { 
        }



        private Intent getBiometricSensorIntent() {

            Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class);

            Intent fallBackIntent = new Intent().setClass(getActivity(),

                    ChooseLockGeneric.InternalActivity.class);

            fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);

            fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false);

            fallBackIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE,

src/com/android/settings/ChooseLockPassword.java

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,9 @@ public class ChooseLockPassword extends PreferenceActivity { 
            super.onCreate(savedInstanceState);

            mLockPatternUtils = new LockPatternUtils(getActivity());

            Intent intent = getActivity().getIntent();

            if (!(getActivity() instanceof ChooseLockPassword)) {

                throw new SecurityException("Fragment contained in wrong activity");

            }

            mRequestedQuality = Math.max(intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY,

                    mRequestedQuality), mLockPatternUtils.getRequestedPasswordQuality());

            mPasswordMinLength = Math.max(

src/com/android/settings/ChooseLockPattern.java

+4 −1
Original line number Diff line number Diff line
@@ -308,6 +308,9 @@ public class ChooseLockPattern extends PreferenceActivity { 
        public void onCreate(Bundle savedInstanceState) {

            super.onCreate(savedInstanceState);

            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());

            if (!(getActivity() instanceof ChooseLockPattern)) {

                throw new SecurityException("Fragment contained in wrong activity");

            }

        }



        @Override
@@ -338,7 +341,7 @@ public class ChooseLockPattern extends PreferenceActivity { 
            topLayout.setDefaultTouchRecepient(mLockPatternView);



            final boolean confirmCredentials = getActivity().getIntent()

                    .getBooleanExtra("confirm_credentials", false);

                    .getBooleanExtra("confirm_credentials", true);



            if (savedInstanceState == null) {

                if (confirmCredentials) {