diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-09-09 09:05:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-09 09:05:53 -0700 |
| commit | 0eec06954460e6617f014f4628362a795f1b6291 (patch) | |
| tree | 1a33665d44fe7902d555e1567be09858cedc9358 /policy | |
| parent | f7c05c0927fe59752146fc766d956a65f975eb42 (diff) | |
| parent | 3705b22c9704050dfb46d784ae84e9d7f9357ad4 (diff) | |
| download | frameworks_base-0eec06954460e6617f014f4628362a795f1b6291.zip frameworks_base-0eec06954460e6617f014f4628362a795f1b6291.tar.gz frameworks_base-0eec06954460e6617f014f4628362a795f1b6291.tar.bz2 | |
am 3705b22c: Merge "Adding null check to prevent monkey crash. (5263199)"
* commit '3705b22c9704050dfb46d784ae84e9d7f9357ad4':
Adding null check to prevent monkey crash. (5263199)
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index f5e3a45..20088b1 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -1401,7 +1401,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (event.getRepeatCount() > 0) break; if (featureId < 0) break; // Currently don't do anything with long press. - dispatcher.startTracking(event, this); + if (dispatcher != null) { + dispatcher.startTracking(event, this); + } return true; } |