summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Harry Cutts <hcutts@google.com> 2023-01-26 17:27:46 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-01-26 17:27:46 +0000
commit2e6e00db9f18766f9065559139af988ee27dd642 (patch)
treef1399bd5a484feefab81516aa3d71374dbd2d015
parente8780c8469b00ae745cd5be5a0bc93ba470584f4 (diff)
parent86f5df6f4c1a840f2b6e5c9ca8a42c747adf1b4f (diff)
Merge "Copy InputDeviceIdentifier instead of taking a reference"
-rw-r--r--services/inputflinger/reader/InputDevice.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/inputflinger/reader/InputDevice.cpp b/services/inputflinger/reader/InputDevice.cpp
index 5582f92be8..c598c0a700 100644
--- a/services/inputflinger/reader/InputDevice.cpp
+++ b/services/inputflinger/reader/InputDevice.cpp
@@ -212,7 +212,7 @@ void InputDevice::addEventHubDevice(int32_t eventHubId, bool populateMappers) {
sysprop::InputProperties::enable_touchpad_gestures_library().value_or(true);
// TODO(b/246587538): Fix the new touchpad stack for Sony DualShock 4 (5c4, 9cc) and DualSense
// (ce6) touchpads, or at least load this setting from the IDC file.
- const InputDeviceIdentifier& identifier = contextPtr->getDeviceIdentifier();
+ const InputDeviceIdentifier identifier = contextPtr->getDeviceIdentifier();
const bool isSonyGamepadTouchpad = identifier.vendor == 0x054c &&
(identifier.product == 0x05c4 || identifier.product == 0x09cc ||
identifier.product == 0x0ce6);