diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-23 14:57:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 14:57:14 -0700 |
| commit | 5bd069fe1e5208b9d41ea108a8c9ada504cae39c (patch) | |
| tree | a52779a7b17789aa40e01e38403558571a81e2f5 /policy | |
| parent | 43480d7b4d8a8cc4806627f91a53966b8c3c5442 (diff) | |
| parent | 279179461edccaa4217fe752a9abf6fcc2efa5a1 (diff) | |
| download | frameworks_base-5bd069fe1e5208b9d41ea108a8c9ada504cae39c.zip frameworks_base-5bd069fe1e5208b9d41ea108a8c9ada504cae39c.tar.gz frameworks_base-5bd069fe1e5208b9d41ea108a8c9ada504cae39c.tar.bz2 | |
am 27917946: am de04fb0a: Merge "Enforce serial ordering of MotionEvents." into gingerbread
Merge commit '279179461edccaa4217fe752a9abf6fcc2efa5a1'
* commit '279179461edccaa4217fe752a9abf6fcc2efa5a1':
Enforce serial ordering of MotionEvents.
Diffstat (limited to 'policy')
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 7009c65..bd774ce 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -235,8 +235,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { @Override public void handleMotion(MotionEvent event, Runnable finishedCallback) { finishedCallback.run(); + synchronized (mLock) { - mPointerLocationView.addTouchEvent(event); + if (mPointerLocationView != null) { + mPointerLocationView.addTouchEvent(event); + } } } }; |