diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-23 14:53:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 14:53:52 -0700 |
| commit | 279179461edccaa4217fe752a9abf6fcc2efa5a1 (patch) | |
| tree | 2a10a295b844e3cbe063da3bfa85863debd91f20 /policy/src | |
| parent | 2b1ffce18301ae051a70a85254133c29b9381593 (diff) | |
| parent | de04fb0a0366057028369eb3b3efcb75367f74db (diff) | |
| download | frameworks_base-279179461edccaa4217fe752a9abf6fcc2efa5a1.zip frameworks_base-279179461edccaa4217fe752a9abf6fcc2efa5a1.tar.gz frameworks_base-279179461edccaa4217fe752a9abf6fcc2efa5a1.tar.bz2 | |
am de04fb0a: Merge "Enforce serial ordering of MotionEvents." into gingerbread
Merge commit 'de04fb0a0366057028369eb3b3efcb75367f74db' into gingerbread-plus-aosp
* commit 'de04fb0a0366057028369eb3b3efcb75367f74db':
Enforce serial ordering of MotionEvents.
Diffstat (limited to 'policy/src')
| -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 274124b..567b270 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -232,8 +232,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); + } } } }; |