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

Commit 85171c01 authored by Peng Xu's avatar Peng Xu Committed by android-build-merger
Browse files

Merge "Sensor: Make switching from data injection mode to normal mode more... 

Merge "Sensor: Make switching from data injection mode to normal mode more productive" am: e6a4e9b0 am: 33685d3a
am: 0674efdb

Change-Id: I056c8fbdf6d4392fc34b9e5b318d2e79afe499d9
parents fe25ad77 0674efdb

services/sensorservice/SensorService.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -945,9 +945,11 @@ status_t SensorService::resetToNormalMode() { 




status_t SensorService::resetToNormalModeLocked() {

status_t SensorService::resetToNormalModeLocked() {

    SensorDevice& dev(SensorDevice::getInstance());

    SensorDevice& dev(SensorDevice::getInstance());

    dev.enableAllSensors();

    status_t err = dev.setMode(NORMAL);

    status_t err = dev.setMode(NORMAL);

    if (err == NO_ERROR) {

        mCurrentOperatingMode = NORMAL;

        mCurrentOperatingMode = NORMAL;

        dev.enableAllSensors();

    }

    return err;

    return err;

}

}