diff options
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 15 | ||||
| -rw-r--r-- | src/com/android/settings/ChooseLockPassword.java | 3 | ||||
| -rw-r--r-- | src/com/android/settings/ChooseLockPattern.java | 5 |
4 files changed, 24 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c76adc8..fe30f83 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1030,7 +1030,6 @@ <!-- Second and third-level settings --> - <!-- Lock screen settings --> <activity android:name="ConfirmLockPattern"/> @@ -1046,7 +1045,10 @@ </intent-filter> </activity> - <activity android:name="ChooseLockPatternSize" android:exported="false"/> + <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"/> diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index f67213c..28b8da9 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -49,6 +49,14 @@ public class ChooseLockGeneric extends PreferenceActivity { return modIntent; } + protected boolean isValidFragment(String fragmentName) { + if (ChooseLockGenericFragment.class.getName().equals(fragmentName)) return true; + 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"; @@ -86,7 +94,9 @@ public class ChooseLockGeneric extends PreferenceActivity { // Defaults to needing to confirm credentials final boolean confirmCredentials = getActivity().getIntent() .getBooleanExtra(CONFIRM_CREDENTIALS, true); - mPasswordConfirmed = !confirmCredentials; + if (getActivity() instanceof ChooseLockGeneric.InternalActivity) { + mPasswordConfirmed = !confirmCredentials; + } if (savedInstanceState != null) { mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED); @@ -325,7 +335,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, diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java index aab4ba6..70ff443 100644 --- a/src/com/android/settings/ChooseLockPassword.java +++ b/src/com/android/settings/ChooseLockPassword.java @@ -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( diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index f92dca4..563b841 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -297,6 +297,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) { |