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

Commit 8017c17b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use String8/16 c_str [sensors]" into udc-dev-plus-aosp am: 8ff64ba4... 

Merge "Use String8/16 c_str [sensors]" into udc-dev-plus-aosp am: 8ff64ba4 am: 6764b4a2 am: c80de8ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24470958



Change-Id: Ibee5add94528cce8f1a34943de0df3d2c3433d14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fdd3357c c80de8ad

libs/sensor/Sensor.cpp

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi 
        if (hwSensor.maxDelay > INT_MAX) {

            // Max delay is declared as a 64 bit integer for 64 bit architectures. But it should

            // always fit in a 32 bit integer, log error and cap it to INT_MAX.

            ALOGE("Sensor maxDelay overflow error %s %" PRId64, mName.string(),

            ALOGE("Sensor maxDelay overflow error %s %" PRId64, mName.c_str(),

                  static_cast<int64_t>(hwSensor.maxDelay));

            mMaxDelay = INT_MAX;

        } else {
@@ -335,7 +335,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi 
        if (actualReportingMode != expectedReportingMode) {

            ALOGE("Reporting Mode incorrect: sensor %s handle=%#010" PRIx32 " type=%" PRId32 " "

                   "actual=%d expected=%d",

                   mName.string(), mHandle, mType, actualReportingMode, expectedReportingMode);

                   mName.c_str(), mHandle, mType, actualReportingMode, expectedReportingMode);

        }

    }
@@ -613,7 +613,7 @@ void Sensor::flattenString8(void*& buffer, size_t& size, 
        const String8& string8) {

    uint32_t len = static_cast<uint32_t>(string8.length());

    FlattenableUtils::write(buffer, size, len);

    memcpy(static_cast<char*>(buffer), string8.string(), len);

    memcpy(static_cast<char*>(buffer), string8.c_str(), len);

    FlattenableUtils::advance(buffer, size, len);

    size -= FlattenableUtils::align<4>(buffer);

}

services/sensorservice/RecentEventLogger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ std::string RecentEventLogger::dump() const { 
        }

        buffer.append("\n");

    }

    return std::string(buffer.string());

    return std::string(buffer.c_str());

}



/**

services/sensorservice/SensorDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ std::string SensorDevice::dump() const { 
        result.appendFormat("}, selected = %.2f ms\n", info.bestBatchParams.mTBatch / 1e6f);

    }



    return result.string();

    return result.c_str();

}



/**

services/sensorservice/SensorDirectConnection.cpp

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void SensorService::SensorDirectConnection::onFirstRef() { 
void SensorService::SensorDirectConnection::dump(String8& result) const {

    Mutex::Autolock _l(mConnectionLock);

    result.appendFormat("\tPackage %s, HAL channel handle %d, total sensor activated %zu\n",

            String8(mOpPackageName).string(), getHalChannelHandle(), mActivated.size());

            String8(mOpPackageName).c_str(), getHalChannelHandle(), mActivated.size());

    for (auto &i : mActivated) {

        result.appendFormat("\t\tSensor %#08x, rate %d\n", i.first, i.second);

    }
@@ -79,7 +79,7 @@ void SensorService::SensorDirectConnection::dump(String8& result) const { 
void SensorService::SensorDirectConnection::dump(ProtoOutputStream* proto) const {

    using namespace service::SensorDirectConnectionProto;

    Mutex::Autolock _l(mConnectionLock);

    proto->write(PACKAGE_NAME, std::string(String8(mOpPackageName).string()));

    proto->write(PACKAGE_NAME, std::string(String8(mOpPackageName).c_str()));

    proto->write(HAL_CHANNEL_HANDLE, getHalChannelHandle());

    proto->write(NUM_SENSOR_ACTIVATED, int(mActivated.size()));

    for (auto &i : mActivated) {

services/sensorservice/SensorEventConnection.cpp

+4 −4
Original line number Diff line number Diff line
@@ -90,12 +90,12 @@ void SensorService::SensorEventConnection::dump(String8& result) { 
        result.append("NORMAL\n");

    }

    result.appendFormat("\t %s | WakeLockRefCount %d | uid %d | cache size %d | "

            "max cache size %d\n", mPackageName.string(), mWakeLockRefCount, mUid, mCacheSize,

            "max cache size %d\n", mPackageName.c_str(), mWakeLockRefCount, mUid, mCacheSize,

            mMaxCacheSize);

    for (auto& it : mSensorInfo) {

        const FlushInfo& flushInfo = it.second;

        result.appendFormat("\t %s 0x%08x | status: %s | pending flush events %d \n",

                            mService->getSensorName(it.first).string(),

                            mService->getSensorName(it.first).c_str(),

                            it.first,

                            flushInfo.mFirstFlushPending ? "First flush pending" :

                                                           "active",
@@ -131,7 +131,7 @@ void SensorService::SensorEventConnection::dump(util::ProtoOutputStream* proto) 
    } else {

        proto->write(OPERATING_MODE, OP_MODE_NORMAL);

    }

    proto->write(PACKAGE_NAME, std::string(mPackageName.string()));

    proto->write(PACKAGE_NAME, std::string(mPackageName.c_str()));

    proto->write(WAKE_LOCK_REF_COUNT, int32_t(mWakeLockRefCount));

    proto->write(UID, int32_t(mUid));

    proto->write(CACHE_SIZE, int32_t(mCacheSize));
@@ -848,7 +848,7 @@ int SensorService::SensorEventConnection::handleEvent(int fd, int events, void* 
            if (numBytesRead == sizeof(sensors_event_t)) {

                if (!mDataInjectionMode) {

                    ALOGE("Data injected in normal mode, dropping event"

                          "package=%s uid=%d", mPackageName.string(), mUid);

                          "package=%s uid=%d", mPackageName.c_str(), mUid);

                    // Unregister call backs.

                    return 0;

                }