commit 3429dd78524107c2f3af4be6f82ca09d8425d0c5
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 20 19:01:21 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 20 19:01:21 2022 +0000
tree 49a4623a0256493e3202eae97445311a7a83fcd3
parent e96e7ddecff561a4833bd29a64e668a4841cd192
parent fb6944857ea347356d130451bc07d846af302f6d

Merge cherrypicks of [2198608] into sc-qpr3-release.

Change-Id: Iff5feb039fda41b0de99b22cb539c22030d22748

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>