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

Commit 53a56ad8 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot... 

am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

* commit '447415f4':
  Make sure that external callers cannot pass in the confirm bypass extra
parents 8d5aeffa 447415f4

AndroidManifest.xml

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


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





        <!-- Lock screen settings -->

        <activity android:name="ConfirmLockPattern"/>
@@ -956,6 +955,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
@@ -49,6 +49,9 @@ public class ChooseLockGeneric extends PreferenceActivity { 
        return modIntent;

    }



    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";
@@ -86,7 +89,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);
@@ -325,7 +330,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
@@ -154,6 +154,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
@@ -301,6 +301,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
@@ -331,7 +334,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) {