Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 260b6d93 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 03335af0: am 567c00a8: Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread 

Merge commit '03335af0dbf14d1eb4503be92a5b10199719898c'

* commit '03335af0dbf14d1eb4503be92a5b10199719898c':
  Fix NPE when handling certain kinds of ANRs.
parents 6f3f8768 28de6a0a

libs/ui/InputDispatcher.cpp

+6 −4
Original line number Diff line number Diff line
@@ -777,6 +777,7 @@ void InputDispatcher::resumeAfterTargetsNotReadyTimeoutLocked(nsecs_t newTimeout 
        mInputTargetWaitTimeoutExpired = true;



        // Input state will not be realistic.  Mark it out of sync.

        if (inputChannel.get()) {

            ssize_t connectionIndex = getConnectionIndexLocked(inputChannel);

            if (connectionIndex >= 0) {

                sp<Connection> connection = mConnectionsByReceiveFd.valueAt(connectionIndex);
@@ -784,6 +785,7 @@ void InputDispatcher::resumeAfterTargetsNotReadyTimeoutLocked(nsecs_t newTimeout 
            }

        }

    }

}



nsecs_t InputDispatcher::getTimeSpentWaitingForApplicationLocked(

        nsecs_t currentTime) {