Merge "Fix Keyguard crash when in landscape." into lmp-preview-dev

2014-06-04 16:07:02 +00:00
parent 53f391c4eb 6a247199ba
commit bc07ebb9b8
1 changed files with 2 additions and 1 deletions
--- 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);
            }