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

Commit f5a1230d authored by Steve Block's avatar Steve Block Committed by Mathias Agopian
Browse files

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
parent 3c20fbed

services/sensorservice/SensorDevice.cpp

+4 −4
Original line number Diff line number Diff line
@@ -105,13 +105,13 @@ SensorDevice::SensorDevice() 
    status_t err = hw_get_module(SENSORS_HARDWARE_MODULE_ID,

            (hw_module_t const**)&mSensorModule);



    LOGE_IF(err, "couldn't load %s module (%s)",

    ALOGE_IF(err, "couldn't load %s module (%s)",

            SENSORS_HARDWARE_MODULE_ID, strerror(-err));



    if (mSensorModule) {

        err = sensors_open(&mSensorModule->common, &mSensorDevice);



        LOGE_IF(err, "couldn't open device for module %s (%s)",

        ALOGE_IF(err, "couldn't open device for module %s (%s)",

                SENSORS_HARDWARE_MODULE_ID, strerror(-err));



        if (mSensorDevice) {
@@ -219,7 +219,7 @@ status_t SensorDevice::activate(void* ident, int handle, int enabled) 


        err = mSensorDevice->activate(mSensorDevice, handle, enabled);

        if (enabled) {

            LOGE_IF(err, "Error activating sensor %d (%s)", handle, strerror(-err));

            ALOGE_IF(err, "Error activating sensor %d (%s)", handle, strerror(-err));

            if (err == 0) {

                BatteryService::getInstance().enableSensor(handle);

            }
@@ -256,7 +256,7 @@ status_t SensorDevice::Info::setDelayForIdent(void* ident, int64_t ns) 
{

    ssize_t index = rates.indexOfKey(ident);

    if (index < 0) {

        LOGE("Info::setDelayForIdent(ident=%p, ns=%lld) failed (%s)",

        ALOGE("Info::setDelayForIdent(ident=%p, ns=%lld) failed (%s)",

                ident, ns, strerror(-index));

        return BAD_INDEX;

    }

services/sensorservice/SensorService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ bool SensorService::threadLoop() 
    do {

        count = device.poll(buffer, numEventMax);

        if (count<0) {

            LOGE("sensor poll failed (%s)", strerror(-count));

            ALOGE("sensor poll failed (%s)", strerror(-count));

            break;

        }
@@ -369,13 +369,13 @@ void SensorService::cleanupConnection(SensorEventConnection* c) 
        if (c->hasSensor(handle)) {

            ALOGD_IF(DEBUG_CONNECTIONS, "%i: disabling handle=0x%08x", i, handle);

            SensorInterface* sensor = mSensorMap.valueFor( handle );

            LOGE_IF(!sensor, "mSensorMap[handle=0x%08x] is null!", handle);

            ALOGE_IF(!sensor, "mSensorMap[handle=0x%08x] is null!", handle);

            if (sensor) {

                sensor->activate(c, false);

            }

        }

        SensorRecord* rec = mActiveSensors.valueAt(i);

        LOGE_IF(!rec, "mActiveSensors[%d] is null (handle=0x%08x)!", i, handle);

        ALOGE_IF(!rec, "mActiveSensors[%d] is null (handle=0x%08x)!", i, handle);

        ALOGD_IF(DEBUG_CONNECTIONS,

                "removing connection %p for sensor[%d].handle=0x%08x",

                c, i, handle);
@@ -598,7 +598,7 @@ status_t SensorService::SensorEventConnection::sendEvents( 
        return size;

    }



    //LOGE_IF(size<0, "dropping %d events on the floor (%s)",

    //ALOGE_IF(size<0, "dropping %d events on the floor (%s)",

    //        count, strerror(-size));



    return size < 0 ? status_t(size) : status_t(NO_ERROR);