Issue #1359 ยป 0001-Make-sure-that-external-callers-cannot-pass-in-the-c.patch
| AndroidManifest.xml | ||
|---|---|---|
|
<!-- Second and third-level settings -->
|
||
|
<!-- Lock screen settings -->
|
||
|
<activity android:name="ConfirmLockPattern"/>
|
||
| ... | ... | |
|
</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"/>
|
||
| src/com/android/settings/ChooseLockGeneric.java | ||
|---|---|---|
|
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";
|
||
| ... | ... | |
|
// 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);
|
||
| ... | ... | |
|
}
|
||
|
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 | ||
|---|---|---|
|
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 | ||
|---|---|---|
|
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
|
||
| ... | ... | |
|
topLayout.setDefaultTouchRecepient(mLockPatternView);
|
||
|
final boolean confirmCredentials = getActivity().getIntent()
|
||
|
.getBooleanExtra("confirm_credentials", false);
|
||
|
.getBooleanExtra("confirm_credentials", true);
|
||
|
if (savedInstanceState == null) {
|
||
|
if (confirmCredentials) {
|
||