PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a NPE in confirm lock screen.

Browse Source 
am: 8b2baed2be

Change-Id: I4c16a428b3409b33815740c734b3390192866a20
This commit is contained in:
Fan Zhang
2016-10-06 20:49:10 +00:00
committed by android-build-merger
parent da414d0afe 8b2baed2be
commit da856402f4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/ConfirmLockPassword.java
View File

@@ -320,11 +320,15 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
return; return;
} }
mPasswordEntryInputDisabler.setInputEnabled(false);
final String pin = mPasswordEntry.getText().toString(); final String pin = mPasswordEntry.getText().toString();
if (TextUtils.isEmpty(pin)) {
return;
}
mPasswordEntryInputDisabler.setInputEnabled(false);
final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra( final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false); ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
Intent intent = new Intent(); Intent intent = new Intent();
if (verifyChallenge) { if (verifyChallenge) {
if (isInternalActivity()) { if (isInternalActivity()) {