Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread

Browse Source
This commit is contained in:
Jeff Brown
2010-09-16 11:06:29 -07:00
committed by Android (Google) Code Review
parent 4198cececf dc3e00563e
commit 567c00a86f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ui/InputDispatcher.cpp
View File

@@ -777,6 +777,7 @@ void InputDispatcher::resumeAfterTargetsNotReadyTimeoutLocked(nsecs_t newTimeout
mInputTargetWaitTimeoutExpired = true; mInputTargetWaitTimeoutExpired = true;
// Input state will not be realistic. Mark it out of sync. // Input state will not be realistic. Mark it out of sync.
if (inputChannel.get()) {
ssize_t connectionIndex = getConnectionIndexLocked(inputChannel); ssize_t connectionIndex = getConnectionIndexLocked(inputChannel);
if (connectionIndex >= 0) { if (connectionIndex >= 0) {
sp<Connection> connection = mConnectionsByReceiveFd.valueAt(connectionIndex); sp<Connection> connection = mConnectionsByReceiveFd.valueAt(connectionIndex);
@@ -784,6 +785,7 @@ void InputDispatcher::resumeAfterTargetsNotReadyTimeoutLocked(nsecs_t newTimeout
} }
} }
} }
}
nsecs_t InputDispatcher::getTimeSpentWaitingForApplicationLocked( nsecs_t InputDispatcher::getTimeSpentWaitingForApplicationLocked(
nsecs_t currentTime) { nsecs_t currentTime) {