diff options
| author | Mike Cleron <mcleron@google.com> | 2011-09-29 12:36:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-29 12:36:55 -0700 |
| commit | 2d56123b110ff20dd849875be328f1712d128dee (patch) | |
| tree | 36f2c012fbcdfa47652b6c1d33f571a4f855db19 | |
| parent | 3d0d7b41728277380d2e07f8de97c7bdf6840122 (diff) | |
| parent | b9a4b3c18aa0094bbbbc2858c765fb4aeafdee67 (diff) | |
| download | frameworks_base-2d56123b110ff20dd849875be328f1712d128dee.zip frameworks_base-2d56123b110ff20dd849875be328f1712d128dee.tar.gz frameworks_base-2d56123b110ff20dd849875be328f1712d128dee.tar.bz2 | |
Merge "Fix lockscreen Bug: 5391404"
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index 2c7f86d..f970ff3 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -996,10 +996,14 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler public boolean handleMessage(Message msg) { switch (msg.what) { case MSG_SHOW_FACELOCK_AREA_VIEW: - mFaceLockAreaView.setVisibility(View.VISIBLE); + if (mFaceLockAreaView != null) { + mFaceLockAreaView.setVisibility(View.VISIBLE); + } break; case MSG_HIDE_FACELOCK_AREA_VIEW: - mFaceLockAreaView.setVisibility(View.GONE); + if (mFaceLockAreaView != null) { + mFaceLockAreaView.setVisibility(View.GONE); + } break; default: Log.w(TAG, "Unhandled message"); |