diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-06-04 20:52:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 20:52:38 +0000 |
| commit | 8abb0a8398b3b7dcced7c5ef5ccf01a55f881c39 (patch) | |
| tree | 13876f5dd0bdb54fb2fda4066b821593bb2916bb /packages/Keyguard | |
| parent | bdd22d6822d6cc53c835f849ff14092ec8dc4dda (diff) | |
| parent | bc07ebb9b86f41472d056a65a196e00ed55690cc (diff) | |
| download | frameworks_base-8abb0a8398b3b7dcced7c5ef5ccf01a55f881c39.zip frameworks_base-8abb0a8398b3b7dcced7c5ef5ccf01a55f881c39.tar.gz frameworks_base-8abb0a8398b3b7dcced7c5ef5ccf01a55f881c39.tar.bz2 | |
am 6dc68cab: Merge "Fix Keyguard crash when in landscape." into lmp-preview-dev
* commit '6dc68cab1858bc899fb3209c61dc86a813e7b8ff':
Fix Keyguard crash when in landscape.
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java index e6de72f..a0b5536 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java @@ -475,7 +475,8 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit interpolator, null); // And the forgot pattern button - if (mForgotPatternButton.getVisibility() == View.VISIBLE) { + if (mForgotPatternButton != null + && mForgotPatternButton.getVisibility() == View.VISIBLE) { mAppearAnimationUtils.createAnimation(mForgotPatternButton, delay, duration, startTranslationY, interpolator, null); } |