diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-16 11:08:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:08:46 -0700 |
| commit | 03335af0dbf14d1eb4503be92a5b10199719898c (patch) | |
| tree | 8d26ba58d846fb9d26dc34cd083f4c48714635bd /libs/ui/InputDispatcher.cpp | |
| parent | ee76ed9c0df11ac70ae67bae051cb64c9d79dafb (diff) | |
| parent | 567c00a86f748ad4d798ae50a09505cc051fc095 (diff) | |
| download | frameworks_base-03335af0dbf14d1eb4503be92a5b10199719898c.zip frameworks_base-03335af0dbf14d1eb4503be92a5b10199719898c.tar.gz frameworks_base-03335af0dbf14d1eb4503be92a5b10199719898c.tar.bz2 | |
am 567c00a8: Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread
Merge commit '567c00a86f748ad4d798ae50a09505cc051fc095' into gingerbread-plus-aosp
* commit '567c00a86f748ad4d798ae50a09505cc051fc095':
Fix NPE when handling certain kinds of ANRs.
Diffstat (limited to 'libs/ui/InputDispatcher.cpp')
| -rw-r--r-- | libs/ui/InputDispatcher.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp index 3b3c483..dea7936 100644 --- a/libs/ui/InputDispatcher.cpp +++ b/libs/ui/InputDispatcher.cpp @@ -777,10 +777,12 @@ void InputDispatcher::resumeAfterTargetsNotReadyTimeoutLocked(nsecs_t newTimeout mInputTargetWaitTimeoutExpired = true; // Input state will not be realistic. Mark it out of sync. - ssize_t connectionIndex = getConnectionIndexLocked(inputChannel); - if (connectionIndex >= 0) { - sp<Connection> connection = mConnectionsByReceiveFd.valueAt(connectionIndex); - connection->inputState.setOutOfSync(); + if (inputChannel.get()) { + ssize_t connectionIndex = getConnectionIndexLocked(inputChannel); + if (connectionIndex >= 0) { + sp<Connection> connection = mConnectionsByReceiveFd.valueAt(connectionIndex); + connection->inputState.setOutOfSync(); + } } } } |