commit fb6944857ea347356d130451bc07d846af302f6d
author Jyoti Bhayana <jbhayana@google.com> Tue Apr 19 16:09:14 2022 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 20 19:01:17 2022 +0000
tree 49a4623a0256493e3202eae97445311a7a83fcd3
parent e96e7ddecff561a4833bd29a64e668a4841cd192

Passing the correct status code from
sensor flush api in Trout Sensor HAL

Bug: 227809838
Test: run cts -m CtsSensorTestCases -s <serial_id> --test android.hardware.cts.SensorAdditionalInfoTest
and make sure it pass

Change-Id: If1521906728ec58d25d99f7b6a069b4688818fb6
(cherry picked from commit 84d81d517c110625f4253f8711075a54e181f901)
Merged-In: If1521906728ec58d25d99f7b6a069b4688818fb6

hal/sensors/2.0/Sensor.cpp

diff --git a/hal/sensors/2.0/Sensor.cpp b/hal/sensors/2.0/Sensor.cpp
index 1d2ea80..d53a11e 100644
--- a/hal/sensors/2.0/Sensor.cpp
+++ b/hal/sensors/2.0/Sensor.cpp
@@ -146,9 +146,10 @@
 }
 
 Result HWSensorBase::flush() {
-    SensorBase::flush();
-    sendAdditionalInfoReport();
-    return Result::OK;
+    Result result = Result::OK;
+    result = SensorBase::flush();
+    if (result == Result::OK) sendAdditionalInfoReport();
+    return result;
 }
 
 template <size_t N>