| commit | a512bfda6d22f0ad8d523a9ea50880a9a89ab463 | [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 10:41:16 2020 -0700 |
| tree | a29cc040a553eec34c436f9f8288fe435777c84d | |
| parent | cb64d4e371a8fd2d427a5581be0088811ead84dc [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
diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp index fb35bee..b1385aa 100644 --- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp +++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -778,7 +778,7 @@ mPointerController->setDisplayViewport(defaultViewport.value_or(mViewport)); } } else { - mPointerController.clear(); + mPointerController.reset(); } if (viewportChanged || deviceModeChanged) {