From 4cea52915aedeaa3092a9980c0ebb5c4b9bdb284 Mon Sep 17 00:00:00 2001
From: Karthik Bharadwaj <karthikmb@google.com>
Date: Mon, 21 Nov 2022 18:28:44 +0000
Subject: [PATCH] Default accel Z direction value to +9.8

Default the accelerometer defaut Z value to +9.8 to indicate a
more 'natural' resting position of flat with screen up for the
device.

Bug: 242736284
Test: Presubmits, vts VtsHalSensorsV2_0TargetTest.
Change-Id: I92357119173dbc99a0a6665de5d733286ac30c3e
---
 sensors/aidl/default/Sensor.cpp                                 | 2 +-
 sensors/common/default/2.X/Sensor.cpp                           | 2 +-
 .../common/default/2.X/multihal/tests/fake_subhal/Sensor.cpp    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sensors/aidl/default/Sensor.cpp b/sensors/aidl/default/Sensor.cpp
index 62193d6c9b..3bdd8b6f1b 100644
--- a/sensors/aidl/default/Sensor.cpp
+++ b/sensors/aidl/default/Sensor.cpp
@@ -223,7 +223,7 @@ void AccelSensor::readEventPayload(EventPayload& payload) {
     EventPayload::Vec3 vec3 = {
             .x = 0,
             .y = 0,
-            .z = -9.8,
+            .z = 9.8,
             .status = SensorStatus::ACCURACY_HIGH,
     };
     payload.set<EventPayload::Tag::vec3>(vec3);
diff --git a/sensors/common/default/2.X/Sensor.cpp b/sensors/common/default/2.X/Sensor.cpp
index fd701fd399..2c1cdfb60e 100644
--- a/sensors/common/default/2.X/Sensor.cpp
+++ b/sensors/common/default/2.X/Sensor.cpp
@@ -218,7 +218,7 @@ AccelSensor::AccelSensor(int32_t sensorHandle, ISensorsEventCallback* callback)
 void AccelSensor::readEventPayload(EventPayload& payload) {
     payload.vec3.x = 0;
     payload.vec3.y = 0;
-    payload.vec3.z = -9.8;
+    payload.vec3.z = 9.8;
     payload.vec3.status = SensorStatus::ACCURACY_HIGH;
 }
 
diff --git a/sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.cpp b/sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.cpp
index f5745c5793..a0bb67a3f9 100644
--- a/sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.cpp
+++ b/sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.cpp
@@ -237,7 +237,7 @@ std::vector<Event> AccelSensor::readEvents() {
     event.timestamp = ::android::elapsedRealtimeNano();
     event.u.vec3.x = 0;
     event.u.vec3.y = 0;
-    event.u.vec3.z = -9.815;
+    event.u.vec3.z = 9.815;
     event.u.vec3.status = SensorStatus::ACCURACY_HIGH;
     events.push_back(event);
     return events;