summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-05-01 17:07:47 -0700
committerRoman Birg <roman@cyngn.com>2015-12-11 10:36:10 -0800
commit13847228afc320824775322ae2e087ec7010f894 (patch)
treebac5dee074ab5182a2dfe758d6e381c773998789 /src
parent2491ab7c142c8fa9ad9a1d9d40ff684ad891962c (diff)
downloadpackages_apps_Settings-13847228afc320824775322ae2e087ec7010f894.tar.gz
packages_apps_Settings-13847228afc320824775322ae2e087ec7010f894.tar.bz2
packages_apps_Settings-13847228afc320824775322ae2e087ec7010f894.zip
Settings: fix non lock pattern CryptKeeper crash
Change-Id: Ib2d6c9a468bfe778d5cb927759f11b2b03c25ee6 Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/CryptKeeper.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 474fce1ba..0d3b69323 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -180,7 +180,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
@Override
protected void onPreExecute() {
super.onPreExecute();
- mLockPatternView.removeCallbacks(mFakeUnlockAttemptRunnable);
+ if (mLockPatternView != null) {
+ mLockPatternView.removeCallbacks(mFakeUnlockAttemptRunnable);
+ }
beginAttempt();
}