Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97258c51 authored by Karthik Bharadwaj's avatar Karthik Bharadwaj Committed by Automerger Merge Worker
Browse files

Merge "Default accel Z direction value to +9.8" am: 34557d45 am: 72239c64 am: 92cbbeab 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2310345



Change-Id: Ie14cc774a21dd1c79e4852bf73ed10aa07d8baa8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2f39c9c 92cbbeab

sensors/aidl/default/Sensor.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -223,7 +223,7 @@ void AccelSensor::readEventPayload(EventPayload& payload) { 
    EventPayload::Vec3 vec3 = {

    EventPayload::Vec3 vec3 = {

            .x = 0,

            .x = 0,

            .y = 0,

            .y = 0,

            .z = -9.8,

            .z = 9.8,

            .status = SensorStatus::ACCURACY_HIGH,

            .status = SensorStatus::ACCURACY_HIGH,

    };

    };

    payload.set<EventPayload::Tag::vec3>(vec3);

    payload.set<EventPayload::Tag::vec3>(vec3);

sensors/common/default/2.X/Sensor.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -218,7 +218,7 @@ AccelSensor::AccelSensor(int32_t sensorHandle, ISensorsEventCallback* callback) 
void AccelSensor::readEventPayload(EventPayload& payload) {

void AccelSensor::readEventPayload(EventPayload& payload) {

    payload.vec3.x = 0;

    payload.vec3.x = 0;

    payload.vec3.y = 0;

    payload.vec3.y = 0;

    payload.vec3.z = -9.8;

    payload.vec3.z = 9.8;

    payload.vec3.status = SensorStatus::ACCURACY_HIGH;

    payload.vec3.status = SensorStatus::ACCURACY_HIGH;

}

}

sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -237,7 +237,7 @@ std::vector<Event> AccelSensor::readEvents() { 
    event.timestamp = ::android::elapsedRealtimeNano();

    event.timestamp = ::android::elapsedRealtimeNano();

    event.u.vec3.x = 0;

    event.u.vec3.x = 0;

    event.u.vec3.y = 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;

    event.u.vec3.status = SensorStatus::ACCURACY_HIGH;

    events.push_back(event);

    events.push_back(event);

    return events;

    return events;