| commit | 8473df88257e64d83659b99460fae2ce01c41c3d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jun 23 00:52:19 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 23 00:52:19 2020 +0000 |
| tree | d1e37482a6dedf77f6c1467ea83510043e1a25ea | |
| parent | cf29ea77c986fa4bf37251312f9fc741389a0bc2 [diff] | |
| parent | b68b87bc7fb012615bda386f6971e82326280761 [diff] |
Merge "Ensure connection is non-null" into rvc-dev am: 402bbb4a57 am: b68b87bc7f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11902845 Change-Id: I144293fe032fa6f04bf802c0b86a0e2a868bd9e7
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp index 3865f29..f011992 100644 --- a/services/inputflinger/dispatcher/InputDispatcher.cpp +++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -717,7 +717,7 @@ for (TouchedMonitor& gestureMonitor : gestureMonitors) { sp<Connection> connection = getConnectionLocked(gestureMonitor.monitor.inputChannel->getConnectionToken()); - if (connection->responsive) { + if (connection != nullptr && connection->responsive) { // This monitor could take more input. Drop all events preceding this // event, so that gesture monitor could get a chance to receive the stream ALOGW("Pruning the input queue because %s is unresponsive, but we have a "