diff options
author | Amith Yamasani <yamasani@google.com> | 2013-09-27 11:18:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-27 11:18:04 -0700 |
commit | 53a56ad89cbd14410dcd8e5755c6765f1a438928 (patch) | |
tree | d80d9673ac8a102233c06b063ddbecd419a30327 | |
parent | 8d5aeffa7dc27eba60fe4c64be6a89e645091958 (diff) | |
parent | 447415f4f17dc91d3844394625f4e6fa10efedad (diff) | |
download | packages_apps_Settings-53a56ad89cbd14410dcd8e5755c6765f1a438928.zip packages_apps_Settings-53a56ad89cbd14410dcd8e5755c6765f1a438928.tar.gz packages_apps_Settings-53a56ad89cbd14410dcd8e5755c6765f1a438928.tar.bz2 |
am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
* commit '447415f4f17dc91d3844394625f4e6fa10efedad':
Make sure that external callers cannot pass in the confirm bypass extra
-rw-r--r-- | AndroidManifest.xml | 6 | ||||
-rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 10 | ||||
-rw-r--r-- | src/com/android/settings/ChooseLockPassword.java | 3 | ||||
-rw-r--r-- | src/com/android/settings/ChooseLockPattern.java | 5 |
4 files changed, 20 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 14207db..c664e05 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -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" diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 14671d1..a59f3aa 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -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); - mPasswordConfirmed = !confirmCredentials; + 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, 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 f9c01b6..5f0da1a 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -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) { |