From b499b1fa082147ad37e1211f32210b44bdbc0750 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Thu, 8 Nov 2012 12:42:54 -0500 Subject: [PATCH] Don't crash if no ECA. (Phone landscape pattern lock, for example.) Bug: 7502613 Change-Id: I3f48c4351ea04db2d8ad9a410166f60257f3d954 --- .../impl/keyguard/KeyguardPatternView.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java index 67469d9143..e114b78bac 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java @@ -129,12 +129,15 @@ protected void onFinishInflate() { mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled()); mForgotPatternButton = (Button) findViewById(R.id.forgot_password_button); - mForgotPatternButton.setText(R.string.kg_forgot_pattern_button_text); - mForgotPatternButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - mCallback.showBackupSecurity(); - } - }); + // note: some configurations don't have an emergency call area + if (mForgotPatternButton != null) { + mForgotPatternButton.setText(R.string.kg_forgot_pattern_button_text); + mForgotPatternButton.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + mCallback.showBackupSecurity(); + } + }); + } setFocusableInTouchMode(true); @@ -148,6 +151,8 @@ public void onClick(View v) { } private void updateFooter(FooterMode mode) { + if (mForgotPatternButton == null) return; // no ECA? no footer + switch (mode) { case Normal: if (DEBUG) Log.d(TAG, "mode normal");