| commit | 7a376674ad3b25ca99f28833a310f1b5d4703f8e | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Fri Jun 26 20:51:44 2020 +0100 |
| committer | Garfield Tan <xutan@google.com> | Tue Jul 07 18:40:32 2020 +0000 |
| tree | 6b28c8fd53c07455cf16942f62f6c0b41ba65503 | |
| parent | 4efc619e4a458940776300b32cb2a00ef0cd9f86 [diff] [blame] |
Move PointerController from sp to shared_ptr Bug: 160010896 Test: atest PointerController_test, atest InputReader_test, manual usage Change-Id: Ic43ab94ca76c736fde0d217efeab99b2afd6f622 Merged-In: Ic43ab94ca76c736fde0d217efeab99b2afd6f622 (cherry picked from commit 17db18e83fb3d4cdba0dcf25c2bcec350fab3d16)
diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.h b/services/inputflinger/reader/mapper/TouchInputMapper.h index 58bfc5c..7f811a0 100644 --- a/services/inputflinger/reader/mapper/TouchInputMapper.h +++ b/services/inputflinger/reader/mapper/TouchInputMapper.h
@@ -376,7 +376,7 @@ nsecs_t mDownTime; // The pointer controller, or null if the device is not a pointer. - sp<PointerControllerInterface> mPointerController; + std::shared_ptr<PointerControllerInterface> mPointerController; std::vector<VirtualKey> mVirtualKeys;