mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-25 23:49:32 -05:00
188 lines
9.0 KiB
Diff
188 lines
9.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Siarhei Vishniakou <svv@google.com>
|
||
|
|
Date: Mon, 21 Jun 2021 22:30:51 +0000
|
||
|
|
Subject: [PATCH] Do not modify vector after getting references
|
||
|
|
|
||
|
|
We used to obtain a reference to a specific element inside a vector. We
|
||
|
|
would then modify the vector, invalidating the reference. But we then
|
||
|
|
used the reference, and passed it to 'assignPointerIds'.
|
||
|
|
|
||
|
|
Refactor the code to modify the collection first, and then to proceed
|
||
|
|
with modifying / reading the elements.
|
||
|
|
|
||
|
|
Bug: 179839665
|
||
|
|
Test: atest inputflinger_tests (on a hwasan build)
|
||
|
|
Merged-In: I9204b954884e9c83a50babdad5e08a0f6d18ad78
|
||
|
|
Change-Id: I9204b954884e9c83a50babdad5e08a0f6d18ad78
|
||
|
|
(cherry picked from commit ade0672333565773645abe89eccc468572c07228)
|
||
|
|
---
|
||
|
|
services/inputflinger/InputReader.cpp | 80 +++++++++++++--------------
|
||
|
|
services/inputflinger/InputReader.h | 2 +-
|
||
|
|
2 files changed, 41 insertions(+), 41 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp
|
||
|
|
index 768c8f88da..7f8457e1e5 100644
|
||
|
|
--- a/services/inputflinger/InputReader.cpp
|
||
|
|
+++ b/services/inputflinger/InputReader.cpp
|
||
|
|
@@ -4082,27 +4082,27 @@ void TouchInputMapper::process(const RawEvent* rawEvent) {
|
||
|
|
}
|
||
|
|
|
||
|
|
void TouchInputMapper::sync(nsecs_t when) {
|
||
|
|
- const RawState* last = mRawStatesPending.isEmpty() ?
|
||
|
|
- &mCurrentRawState : &mRawStatesPending.top();
|
||
|
|
-
|
||
|
|
// Push a new state.
|
||
|
|
mRawStatesPending.push();
|
||
|
|
- RawState* next = &mRawStatesPending.editTop();
|
||
|
|
- next->clear();
|
||
|
|
- next->when = when;
|
||
|
|
+ RawState& next = mRawStatesPending.editTop();
|
||
|
|
+ next.clear();
|
||
|
|
+ next.when = when;
|
||
|
|
|
||
|
|
// Sync button state.
|
||
|
|
- next->buttonState = mTouchButtonAccumulator.getButtonState()
|
||
|
|
+ next.buttonState = mTouchButtonAccumulator.getButtonState()
|
||
|
|
| mCursorButtonAccumulator.getButtonState();
|
||
|
|
|
||
|
|
// Sync scroll
|
||
|
|
- next->rawVScroll = mCursorScrollAccumulator.getRelativeVWheel();
|
||
|
|
- next->rawHScroll = mCursorScrollAccumulator.getRelativeHWheel();
|
||
|
|
+ next.rawVScroll = mCursorScrollAccumulator.getRelativeVWheel();
|
||
|
|
+ next.rawHScroll = mCursorScrollAccumulator.getRelativeHWheel();
|
||
|
|
mCursorScrollAccumulator.finishSync();
|
||
|
|
|
||
|
|
// Sync touch
|
||
|
|
- syncTouch(when, next);
|
||
|
|
+ syncTouch(when, &next);
|
||
|
|
|
||
|
|
+ // The last RawState is actually the second to last, since we just added a new state
|
||
|
|
+ const RawState& last = mRawStatesPending.size() == 1 ?
|
||
|
|
+ mCurrentRawState : mRawStatesPending.editItemAt(mRawStatesPending.size() - 2);
|
||
|
|
// Assign pointer ids.
|
||
|
|
if (!mHavePointerIds) {
|
||
|
|
assignPointerIds(last, next);
|
||
|
|
@@ -4111,12 +4111,12 @@ void TouchInputMapper::sync(nsecs_t when) {
|
||
|
|
#if DEBUG_RAW_EVENTS
|
||
|
|
ALOGD("syncTouch: pointerCount %d -> %d, touching ids 0x%08x -> 0x%08x, "
|
||
|
|
"hovering ids 0x%08x -> 0x%08x",
|
||
|
|
- last->rawPointerData.pointerCount,
|
||
|
|
- next->rawPointerData.pointerCount,
|
||
|
|
- last->rawPointerData.touchingIdBits.value,
|
||
|
|
- next->rawPointerData.touchingIdBits.value,
|
||
|
|
- last->rawPointerData.hoveringIdBits.value,
|
||
|
|
- next->rawPointerData.hoveringIdBits.value);
|
||
|
|
+ last.rawPointerData.pointerCount,
|
||
|
|
+ next.rawPointerData.pointerCount,
|
||
|
|
+ last.rawPointerData.touchingIdBits.value,
|
||
|
|
+ next.rawPointerData.touchingIdBits.value,
|
||
|
|
+ last.rawPointerData.hoveringIdBits.value,
|
||
|
|
+ next.rawPointerData.hoveringIdBits.value);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
processRawTouches(false /*timeout*/);
|
||
|
|
@@ -6368,11 +6368,11 @@ const TouchInputMapper::VirtualKey* TouchInputMapper::findVirtualKeyHit(
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
|
||
|
|
-void TouchInputMapper::assignPointerIds(const RawState* last, RawState* current) {
|
||
|
|
- uint32_t currentPointerCount = current->rawPointerData.pointerCount;
|
||
|
|
- uint32_t lastPointerCount = last->rawPointerData.pointerCount;
|
||
|
|
+void TouchInputMapper::assignPointerIds(const RawState& last, RawState& current) {
|
||
|
|
+ uint32_t currentPointerCount = current.rawPointerData.pointerCount;
|
||
|
|
+ uint32_t lastPointerCount = last.rawPointerData.pointerCount;
|
||
|
|
|
||
|
|
- current->rawPointerData.clearIdBits();
|
||
|
|
+ current.rawPointerData.clearIdBits();
|
||
|
|
|
||
|
|
if (currentPointerCount == 0) {
|
||
|
|
// No pointers to assign.
|
||
|
|
@@ -6383,21 +6383,21 @@ void TouchInputMapper::assignPointerIds(const RawState* last, RawState* current)
|
||
|
|
// All pointers are new.
|
||
|
|
for (uint32_t i = 0; i < currentPointerCount; i++) {
|
||
|
|
uint32_t id = i;
|
||
|
|
- current->rawPointerData.pointers[i].id = id;
|
||
|
|
- current->rawPointerData.idToIndex[id] = i;
|
||
|
|
- current->rawPointerData.markIdBit(id, current->rawPointerData.isHovering(i));
|
||
|
|
+ current.rawPointerData.pointers[i].id = id;
|
||
|
|
+ current.rawPointerData.idToIndex[id] = i;
|
||
|
|
+ current.rawPointerData.markIdBit(id, current.rawPointerData.isHovering(i));
|
||
|
|
}
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (currentPointerCount == 1 && lastPointerCount == 1
|
||
|
|
- && current->rawPointerData.pointers[0].toolType
|
||
|
|
- == last->rawPointerData.pointers[0].toolType) {
|
||
|
|
+ && current.rawPointerData.pointers[0].toolType
|
||
|
|
+ == last.rawPointerData.pointers[0].toolType) {
|
||
|
|
// Only one pointer and no change in count so it must have the same id as before.
|
||
|
|
- uint32_t id = last->rawPointerData.pointers[0].id;
|
||
|
|
- current->rawPointerData.pointers[0].id = id;
|
||
|
|
- current->rawPointerData.idToIndex[id] = 0;
|
||
|
|
- current->rawPointerData.markIdBit(id, current->rawPointerData.isHovering(0));
|
||
|
|
+ uint32_t id = last.rawPointerData.pointers[0].id;
|
||
|
|
+ current.rawPointerData.pointers[0].id = id;
|
||
|
|
+ current.rawPointerData.idToIndex[id] = 0;
|
||
|
|
+ current.rawPointerData.markIdBit(id, current.rawPointerData.isHovering(0));
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -6415,9 +6415,9 @@ void TouchInputMapper::assignPointerIds(const RawState* last, RawState* current)
|
||
|
|
for (uint32_t lastPointerIndex = 0; lastPointerIndex < lastPointerCount;
|
||
|
|
lastPointerIndex++) {
|
||
|
|
const RawPointerData::Pointer& currentPointer =
|
||
|
|
- current->rawPointerData.pointers[currentPointerIndex];
|
||
|
|
+ current.rawPointerData.pointers[currentPointerIndex];
|
||
|
|
const RawPointerData::Pointer& lastPointer =
|
||
|
|
- last->rawPointerData.pointers[lastPointerIndex];
|
||
|
|
+ last.rawPointerData.pointers[lastPointerIndex];
|
||
|
|
if (currentPointer.toolType == lastPointer.toolType) {
|
||
|
|
int64_t deltaX = currentPointer.x - lastPointer.x;
|
||
|
|
int64_t deltaY = currentPointer.y - lastPointer.y;
|
||
|
|
@@ -6523,11 +6523,11 @@ void TouchInputMapper::assignPointerIds(const RawState* last, RawState* current)
|
||
|
|
matchedCurrentBits.markBit(currentPointerIndex);
|
||
|
|
matchedLastBits.markBit(lastPointerIndex);
|
||
|
|
|
||
|
|
- uint32_t id = last->rawPointerData.pointers[lastPointerIndex].id;
|
||
|
|
- current->rawPointerData.pointers[currentPointerIndex].id = id;
|
||
|
|
- current->rawPointerData.idToIndex[id] = currentPointerIndex;
|
||
|
|
- current->rawPointerData.markIdBit(id,
|
||
|
|
- current->rawPointerData.isHovering(currentPointerIndex));
|
||
|
|
+ uint32_t id = last.rawPointerData.pointers[lastPointerIndex].id;
|
||
|
|
+ current.rawPointerData.pointers[currentPointerIndex].id = id;
|
||
|
|
+ current.rawPointerData.idToIndex[id] = currentPointerIndex;
|
||
|
|
+ current.rawPointerData.markIdBit(id,
|
||
|
|
+ current.rawPointerData.isHovering(currentPointerIndex));
|
||
|
|
usedIdBits.markBit(id);
|
||
|
|
|
||
|
|
#if DEBUG_POINTER_ASSIGNMENT
|
||
|
|
@@ -6543,10 +6543,10 @@ void TouchInputMapper::assignPointerIds(const RawState* last, RawState* current)
|
||
|
|
uint32_t currentPointerIndex = matchedCurrentBits.markFirstUnmarkedBit();
|
||
|
|
uint32_t id = usedIdBits.markFirstUnmarkedBit();
|
||
|
|
|
||
|
|
- current->rawPointerData.pointers[currentPointerIndex].id = id;
|
||
|
|
- current->rawPointerData.idToIndex[id] = currentPointerIndex;
|
||
|
|
- current->rawPointerData.markIdBit(id,
|
||
|
|
- current->rawPointerData.isHovering(currentPointerIndex));
|
||
|
|
+ current.rawPointerData.pointers[currentPointerIndex].id = id;
|
||
|
|
+ current.rawPointerData.idToIndex[id] = currentPointerIndex;
|
||
|
|
+ current.rawPointerData.markIdBit(id,
|
||
|
|
+ current.rawPointerData.isHovering(currentPointerIndex));
|
||
|
|
|
||
|
|
#if DEBUG_POINTER_ASSIGNMENT
|
||
|
|
ALOGD("assignPointerIds - assigned: cur=%d, id=%d",
|
||
|
|
diff --git a/services/inputflinger/InputReader.h b/services/inputflinger/InputReader.h
|
||
|
|
index dacdacc8de..9c11f8dc80 100644
|
||
|
|
--- a/services/inputflinger/InputReader.h
|
||
|
|
+++ b/services/inputflinger/InputReader.h
|
||
|
|
@@ -1906,7 +1906,7 @@ private:
|
||
|
|
bool isPointInsideSurface(int32_t x, int32_t y);
|
||
|
|
const VirtualKey* findVirtualKeyHit(int32_t x, int32_t y);
|
||
|
|
|
||
|
|
- static void assignPointerIds(const RawState* last, RawState* current);
|
||
|
|
+ static void assignPointerIds(const RawState& last, RawState& current);
|
||
|
|
|
||
|
|
void unfadePointer(PointerControllerInterface::Transition transition);
|
||
|
|
|