commit 07247342957acd9071bce476cf3391299b92ea7a
author Siarhei Vishniakou <svv@google.com> Fri Jul 15 14:27:37 2022 -0700
committer Siarhei Vishniakou <svv@google.com> Mon Jul 18 15:37:54 2022 +0000
tree fb099a601071b134647e3e4eed8156d169000cbd
parent 2421088b55279be0f7b8669ad07dba399547ae23

Pass by reference instead of pointer

When the parameters are assumed to be non-null, they should be passed by
reference instead of by pointer.


Bug: 239182977
Test: atest inputflinger_tests
Change-Id: Ifd21a87020f2e9056b3a233ddd33d3f3440b94ee

services/inputflinger/reader/mapper/TouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index cd0e353..c1111f2 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -2231,13 +2231,16 @@
                     toolMinor = toolMajor;
                 }
 
-                mCalibration.applySizeScaleAndBias(&touchMajor);
-                mCalibration.applySizeScaleAndBias(&touchMinor);
-                mCalibration.applySizeScaleAndBias(&toolMajor);
-                mCalibration.applySizeScaleAndBias(&toolMinor);
+                mCalibration.applySizeScaleAndBias(touchMajor);
+                mCalibration.applySizeScaleAndBias(touchMinor);
+                mCalibration.applySizeScaleAndBias(toolMajor);
+                mCalibration.applySizeScaleAndBias(toolMinor);
                 size *= mSizeScale;
                 break;
-            default:
+            case Calibration::SizeCalibration::DEFAULT:
+                LOG_ALWAYS_FATAL("Resolution should not be 'DEFAULT' at this point");
+                break;
+            case Calibration::SizeCalibration::NONE:
                 touchMajor = 0;
                 touchMinor = 0;
                 toolMajor = 0;

services/inputflinger/reader/mapper/TouchInputMapper.h

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.h b/services/inputflinger/reader/mapper/TouchInputMapper.h
index 7b8f6a1..3cb11aa 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.h
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.h
@@ -291,15 +291,15 @@
 
         CoverageCalibration coverageCalibration;
 
-        inline void applySizeScaleAndBias(float* outSize) const {
+        inline void applySizeScaleAndBias(float& outSize) const {
             if (sizeScale) {
-                *outSize *= *sizeScale;
+                outSize *= *sizeScale;
             }
             if (sizeBias) {
-                *outSize += *sizeBias;
+                outSize += *sizeBias;
             }
-            if (*outSize < 0) {
-                *outSize = 0;
+            if (outSize < 0) {
+                outSize = 0;
             }
         }
     } mCalibration;