summaryrefslogtreecommitdiffstats
path: root/services/inputflinger
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-04-20 22:03:54 +0100
committerMichael Wright <michaelwr@google.com>2015-04-20 22:03:54 +0100
commit4af18b90c149deba620270670c8c630a3fe56165 (patch)
tree7fce1cea9c21ef71e5e829f2f900ff498e19adbd /services/inputflinger
parentb85401d4badec20da60a588ee5d04cb139036a5d (diff)
downloadframeworks_native-4af18b90c149deba620270670c8c630a3fe56165.zip
frameworks_native-4af18b90c149deba620270670c8c630a3fe56165.tar.gz
frameworks_native-4af18b90c149deba620270670c8c630a3fe56165.tar.bz2
Always update external stylus state.
This prevents us from dropping any states (namely the pressure transition from non-zero to zero) if we get the touch up before we get the stylus data. Change-Id: Ifc198628d35b7079dc5ec23d81f9681d122757a0
Diffstat (limited to 'services/inputflinger')
-rw-r--r--services/inputflinger/InputReader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp
index 5654799..0e60d4d 100644
--- a/services/inputflinger/InputReader.cpp
+++ b/services/inputflinger/InputReader.cpp
@@ -4127,13 +4127,13 @@ void TouchInputMapper::timeoutExpired(nsecs_t when) {
}
void TouchInputMapper::updateExternalStylusState(const StylusState& state) {
+ mExternalStylusState.copyFrom(state);
if (mExternalStylusId != -1 || mExternalStylusDataTimeout != LLONG_MAX) {
// We're either in the middle of a fused stream of data or we're waiting on data before
// dispatching the initial down, so go ahead and dispatch now that we have fresh stylus
// data.
mExternalStylusDataTimeout = LLONG_MAX;
mExternalStylusDataPending = true;
- mExternalStylusState.copyFrom(state);
processRawTouches(false /*timeout*/);
}
}