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

Commit ce7281eb authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Migrate String8/16 from .string() to c_str()" into main am: 6bfa6a02... 

Merge "Migrate String8/16 from .string() to c_str()" into main am: 6bfa6a02 am: 7b791783 am: 491d18b8

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2703570



Change-Id: I573e5b005c07ae3b5b4cb2d9c9af05ee664a9f36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8631651c 491d18b8

fs_mgr/libfiemap/binder.cpp

+13 −13
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ class ImageManagerBinder final : public IImageManager { 


static FiemapStatus ToFiemapStatus(const char* func, const binder::Status& status) {

    if (!status.isOk()) {

        LOG(ERROR) << func << " binder returned: " << status.toString8().string();

        LOG(ERROR) << func << " binder returned: " << status.toString8().c_str();

        if (status.serviceSpecificErrorCode() != 0) {

            return FiemapStatus::FromErrorCode(status.serviceSpecificErrorCode());

        } else {
@@ -106,7 +106,7 @@ bool ImageManagerBinder::DeleteBackingImage(const std::string& name) { 
    auto status = manager_->deleteBackingImage(name);

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

        return false;

    }

    return true;
@@ -122,7 +122,7 @@ bool ImageManagerBinder::MapImageDevice(const std::string& name, 
    auto status = manager_->mapImageDevice(name, timeout_ms_count, &map);

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

        return false;

    }

    *path = map.path;
@@ -133,7 +133,7 @@ bool ImageManagerBinder::UnmapImageDevice(const std::string& name) { 
    auto status = manager_->unmapImageDevice(name);

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

        return false;

    }

    return true;
@@ -144,7 +144,7 @@ bool ImageManagerBinder::BackingImageExists(const std::string& name) { 
    auto status = manager_->backingImageExists(name, &retval);

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

        return false;

    }

    return retval;
@@ -155,7 +155,7 @@ bool ImageManagerBinder::IsImageMapped(const std::string& name) { 
    auto status = manager_->isImageMapped(name, &retval);

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

        return false;

    }

    return retval;
@@ -175,7 +175,7 @@ std::vector<std::string> ImageManagerBinder::GetAllBackingImages() { 
    auto status = manager_->getAllBackingImages(&retval);

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

    }

    return retval;

}
@@ -189,7 +189,7 @@ bool ImageManagerBinder::RemoveAllImages() { 
    auto status = manager_->removeAllImages();

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

        return false;

    }

    return true;
@@ -199,7 +199,7 @@ bool ImageManagerBinder::DisableImage(const std::string& name) { 
    auto status = manager_->disableImage(name);

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

        return false;

    }

    return true;
@@ -209,7 +209,7 @@ bool ImageManagerBinder::RemoveDisabledImages() { 
    auto status = manager_->removeDisabledImages();

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

        return false;

    }

    return true;
@@ -219,7 +219,7 @@ bool ImageManagerBinder::GetMappedImageDevice(const std::string& name, std::stri 
    auto status = manager_->getMappedImageDevice(name, device);

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

        return false;

    }

    return !device->empty();
@@ -230,7 +230,7 @@ bool ImageManagerBinder::IsImageDisabled(const std::string& name) { 
    auto status = manager_->isImageDisabled(name, &retval);

    if (!status.isOk()) {

        LOG(ERROR) << __PRETTY_FUNCTION__

                   << " binder returned: " << status.exceptionMessage().string();

                   << " binder returned: " << status.exceptionMessage().c_str();

        return false;

    }

    return retval;
@@ -249,7 +249,7 @@ std::unique_ptr<IImageManager> IImageManager::Open(const std::string& dir, 


    auto status = service->openImageService(dir, &manager);

    if (!status.isOk() || !manager) {

        LOG(ERROR) << "Could not acquire IImageManager: " << status.exceptionMessage().string();

        LOG(ERROR) << "Could not acquire IImageManager: " << status.exceptionMessage().c_str();

        return nullptr;

    }

    return std::make_unique<ImageManagerBinder>(std::move(service), std::move(manager));

healthd/BatteryMonitor.cpp

+12 −19
Original line number Diff line number Diff line
@@ -444,12 +444,10 @@ void BatteryMonitor::updateValues(void) { 


    for (size_t i = 0; i < mChargerNames.size(); i++) {

        String8 path;

        path.appendFormat("%s/%s/online", POWER_SUPPLY_SYSFS_PATH,

                          mChargerNames[i].string());

        path.appendFormat("%s/%s/online", POWER_SUPPLY_SYSFS_PATH, mChargerNames[i].c_str());

        if (getIntField(path)) {

            path.clear();

            path.appendFormat("%s/%s/type", POWER_SUPPLY_SYSFS_PATH,

                              mChargerNames[i].string());

            path.appendFormat("%s/%s/type", POWER_SUPPLY_SYSFS_PATH, mChargerNames[i].c_str());

            switch(readPowerSupplyType(path)) {

            case ANDROID_POWER_SUPPLY_TYPE_AC:

                mHealthInfo->chargerAcOnline = true;
@@ -466,26 +464,24 @@ void BatteryMonitor::updateValues(void) { 
            default:

                path.clear();

                path.appendFormat("%s/%s/is_dock", POWER_SUPPLY_SYSFS_PATH,

                                  mChargerNames[i].string());

                if (access(path.string(), R_OK) == 0)

                                  mChargerNames[i].c_str());

                if (access(path.c_str(), R_OK) == 0)

                    mHealthInfo->chargerDockOnline = true;

                else

                    KLOG_WARNING(LOG_TAG, "%s: Unknown power supply type\n",

                                 mChargerNames[i].string());

                                 mChargerNames[i].c_str());

            }

            path.clear();

            path.appendFormat("%s/%s/current_max", POWER_SUPPLY_SYSFS_PATH,

                              mChargerNames[i].string());

            int ChargingCurrent =

                    (access(path.string(), R_OK) == 0) ? getIntField(path) : 0;

                              mChargerNames[i].c_str());

            int ChargingCurrent = (access(path.c_str(), R_OK) == 0) ? getIntField(path) : 0;



            path.clear();

            path.appendFormat("%s/%s/voltage_max", POWER_SUPPLY_SYSFS_PATH,

                              mChargerNames[i].string());

                              mChargerNames[i].c_str());



            int ChargingVoltage =

                (access(path.string(), R_OK) == 0) ? getIntField(path) :

                DEFAULT_VBUS_VOLTAGE;

                    (access(path.c_str(), R_OK) == 0) ? getIntField(path) : DEFAULT_VBUS_VOLTAGE;



            double power = ((double)ChargingCurrent / MILLION) *

                           ((double)ChargingVoltage / MILLION);
@@ -775,8 +771,7 @@ void BatteryMonitor::init(struct healthd_config *hc) { 
            case ANDROID_POWER_SUPPLY_TYPE_DOCK:

                path.clear();

                path.appendFormat("%s/%s/online", POWER_SUPPLY_SYSFS_PATH, name);

                if (access(path.string(), R_OK) == 0)

                    mChargerNames.add(String8(name));

                if (access(path.c_str(), R_OK) == 0) mChargerNames.add(String8(name));

                break;



            case ANDROID_POWER_SUPPLY_TYPE_BATTERY:
@@ -958,12 +953,10 @@ void BatteryMonitor::init(struct healthd_config *hc) { 
            // Look for "is_dock" file

            path.clear();

            path.appendFormat("%s/%s/is_dock", POWER_SUPPLY_SYSFS_PATH, name);

            if (access(path.string(), R_OK) == 0) {

            if (access(path.c_str(), R_OK) == 0) {

                path.clear();

                path.appendFormat("%s/%s/online", POWER_SUPPLY_SYSFS_PATH, name);

                if (access(path.string(), R_OK) == 0)

                    mChargerNames.add(String8(name));



                if (access(path.c_str(), R_OK) == 0) mChargerNames.add(String8(name));

            }

        }

    }

healthd/BatteryMonitor_v1.cpp

+12 −19
Original line number Diff line number Diff line
@@ -358,12 +358,10 @@ void BatteryMonitor::updateValues(void) { 


    for (size_t i = 0; i < mChargerNames.size(); i++) {

        String8 path;

        path.appendFormat("%s/%s/online", POWER_SUPPLY_SYSFS_PATH,

                          mChargerNames[i].string());

        path.appendFormat("%s/%s/online", POWER_SUPPLY_SYSFS_PATH, mChargerNames[i].c_str());

        if (getIntField(path)) {

            path.clear();

            path.appendFormat("%s/%s/type", POWER_SUPPLY_SYSFS_PATH,

                              mChargerNames[i].string());

            path.appendFormat("%s/%s/type", POWER_SUPPLY_SYSFS_PATH, mChargerNames[i].c_str());

            switch(readPowerSupplyType(path)) {

            case ANDROID_POWER_SUPPLY_TYPE_AC:

                mHealthInfo->chargerAcOnline = true;
@@ -380,26 +378,24 @@ void BatteryMonitor::updateValues(void) { 
            default:

                path.clear();

                path.appendFormat("%s/%s/is_dock", POWER_SUPPLY_SYSFS_PATH,

                                  mChargerNames[i].string());

                if (access(path.string(), R_OK) == 0)

                                  mChargerNames[i].c_str());

                if (access(path.c_str(), R_OK) == 0)

                    mHealthInfo->chargerDockOnline = true;

                else

                    KLOG_WARNING(LOG_TAG, "%s: Unknown power supply type\n",

                                 mChargerNames[i].string());

                                 mChargerNames[i].c_str());

            }

            path.clear();

            path.appendFormat("%s/%s/current_max", POWER_SUPPLY_SYSFS_PATH,

                              mChargerNames[i].string());

            int ChargingCurrent =

                    (access(path.string(), R_OK) == 0) ? getIntField(path) : 0;

                              mChargerNames[i].c_str());

            int ChargingCurrent = (access(path.c_str(), R_OK) == 0) ? getIntField(path) : 0;



            path.clear();

            path.appendFormat("%s/%s/voltage_max", POWER_SUPPLY_SYSFS_PATH,

                              mChargerNames[i].string());

                              mChargerNames[i].c_str());



            int ChargingVoltage =

                (access(path.string(), R_OK) == 0) ? getIntField(path) :

                DEFAULT_VBUS_VOLTAGE;

                    (access(path.c_str(), R_OK) == 0) ? getIntField(path) : DEFAULT_VBUS_VOLTAGE;



            double power = ((double)ChargingCurrent / MILLION) *

                           ((double)ChargingVoltage / MILLION);
@@ -628,8 +624,7 @@ void BatteryMonitor::init(struct healthd_config *hc) { 
            case ANDROID_POWER_SUPPLY_TYPE_DOCK:

                path.clear();

                path.appendFormat("%s/%s/online", POWER_SUPPLY_SYSFS_PATH, name);

                if (access(path.string(), R_OK) == 0)

                    mChargerNames.add(String8(name));

                if (access(path.c_str(), R_OK) == 0) mChargerNames.add(String8(name));

                break;



            case ANDROID_POWER_SUPPLY_TYPE_BATTERY:
@@ -767,12 +762,10 @@ void BatteryMonitor::init(struct healthd_config *hc) { 
            // Look for "is_dock" file

            path.clear();

            path.appendFormat("%s/%s/is_dock", POWER_SUPPLY_SYSFS_PATH, name);

            if (access(path.string(), R_OK) == 0) {

            if (access(path.c_str(), R_OK) == 0) {

                path.clear();

                path.appendFormat("%s/%s/online", POWER_SUPPLY_SYSFS_PATH, name);

                if (access(path.string(), R_OK) == 0)

                    mChargerNames.add(String8(name));



                if (access(path.c_str(), R_OK) == 0) mChargerNames.add(String8(name));

            }

        }

    }

libutils/ProcessCallStack.cpp

+2 −3
Original line number Diff line number Diff line
@@ -205,8 +205,7 @@ void ProcessCallStack::print(Printer& printer) const { 
}



void ProcessCallStack::printInternal(Printer& printer, Printer& csPrinter) const {

    dumpProcessHeader(printer, getpid(),

                      getTimeString(mTimeUpdated).string());

    dumpProcessHeader(printer, getpid(), getTimeString(mTimeUpdated).c_str());



    for (size_t i = 0; i < mThreadMap.size(); ++i) {

        pid_t tid = mThreadMap.keyAt(i);
@@ -214,7 +213,7 @@ void ProcessCallStack::printInternal(Printer& printer, Printer& csPrinter) const 
        const String8& threadName = threadInfo.threadName;



        printer.printLine("");

        printer.printFormatLine("\"%s\" sysTid=%d", threadName.string(), tid);

        printer.printFormatLine("\"%s\" sysTid=%d", threadName.c_str(), tid);



        threadInfo.callStack.print(csPrinter);

    }

libutils/RefBase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ public: 
                     this);

            int rc = open(name, O_RDWR | O_CREAT | O_APPEND, 0644);

            if (rc >= 0) {

                (void)write(rc, text.string(), text.length());

                (void)write(rc, text.c_str(), text.length());

                close(rc);

                ALOGI("STACK TRACE for %p saved in %s", this, name);

            }