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

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

Merge "Use String8/16 c_str [aosp-main-future]" into aosp-main-future am:... 

Merge "Use String8/16 c_str [aosp-main-future]" into aosp-main-future am: 19bcc3a5 am: be1e4e8d am: 77d48e43 am: ff14d52b

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



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

libs/gui/BufferQueueProducer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -508,13 +508,13 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou 
        {

            if (CC_UNLIKELY(ATRACE_ENABLED())) {

                if (buffer == nullptr) {

                    ATRACE_FORMAT_INSTANT("%s buffer reallocation: null", mConsumerName.string());

                    ATRACE_FORMAT_INSTANT("%s buffer reallocation: null", mConsumerName.c_str());

                } else {

                    ATRACE_FORMAT_INSTANT("%s buffer reallocation actual %dx%d format:%d "

                                          "layerCount:%d "

                                          "usage:%d requested: %dx%d format:%d layerCount:%d "

                                          "usage:%d ",

                                          mConsumerName.string(), width, height, format,

                                          mConsumerName.c_str(), width, height, format,

                                          BQ_LAYER_COUNT, usage, buffer->getWidth(),

                                          buffer->getHeight(), buffer->getPixelFormat(),

                                          buffer->getLayerCount(), buffer->getUsage());

libs/gui/SurfaceComposerClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2431,7 +2431,7 @@ status_t SurfaceComposerClient::createSurfaceChecked(const String8& name, uint32 


    if (mStatus == NO_ERROR) {

        gui::CreateSurfaceResult result;

        binder::Status status = mClient->createSurface(std::string(name.string()), flags,

        binder::Status status = mClient->createSurface(std::string(name.c_str()), flags,

                                                       parentHandle, std::move(metadata), &result);

        err = statusTFromBinderStatus(status);

        if (outTransformHint) {

libs/input/PropertyMap.cpp

+2 −2
Original line number Diff line number Diff line
@@ -200,13 +200,13 @@ status_t PropertyMap::Parser::parse() { 
                return BAD_VALUE;

            }



            if (mMap->hasProperty(keyToken.string())) {

            if (mMap->hasProperty(keyToken.c_str())) {

                ALOGE("%s: Duplicate property value for key '%s'.",

                      mTokenizer->getLocation().c_str(), keyToken.c_str());

                return BAD_VALUE;

            }



            mMap->addProperty(keyToken.string(), valueToken.string());

            mMap->addProperty(keyToken.c_str(), valueToken.c_str());

        }



        mTokenizer->nextLine();

services/sensorservice/SensorEventConnection.cpp

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ int SensorService::SensorEventConnection::handleEvent(int fd, int events, void* 
                }

                if (!mService->isAllowListedPackage(mPackageName)) {

                    ALOGE("App not allowed to inject data, dropping event"

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

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

                    return 0;

                }

                sensors_event_t sensor_event;

services/sensorservice/SensorService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ status_t SensorService::dump(int fd, const Vector<String16>& args) { 
        }

        if (args.size() > 0) {

            Mode targetOperatingMode = NORMAL;

            std::string inputStringMode = String8(args[0]).string();

            std::string inputStringMode = String8(args[0]).c_str();

            if (getTargetOperatingMode(inputStringMode, &targetOperatingMode)) {

              status_t error = changeOperatingMode(args, targetOperatingMode);

              // Dump the latest state only if no error was encountered.
@@ -1495,7 +1495,7 @@ void SensorService::addSensorIfAccessible(const String16& opPackageName, const S 
        accessibleSensorList.add(sensor);

    } else if (sensor.getType() != SENSOR_TYPE_HEAD_TRACKER) {

        ALOGI("Skipped sensor %s because it requires permission %s and app op %" PRId32,

        sensor.getName().string(), sensor.getRequiredPermission().string(),

        sensor.getName().c_str(), sensor.getRequiredPermission().c_str(),

        sensor.getRequiredAppOp());

    }

}