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

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

Merge "Migrate String8|16.setTo to assignment operator" into main am:... 

Merge "Migrate String8|16.setTo to assignment operator" into main am: c01e3ba0 am: 1ca55b9e am: 6fd58092

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724077



Change-Id: Id9a7d4a563101a42f53635b7a4b8d96b35e57928
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13ab173d 6fd58092

cmds/app_process/app_main.cpp

+2 −2
Original line number Diff line number Diff line
@@ -271,9 +271,9 @@ int main(int argc, char* const argv[]) 
        } else if (strcmp(arg, "--application") == 0) {

            application = true;

        } else if (strncmp(arg, "--nice-name=", 12) == 0) {

            niceName.setTo(arg + 12);

            niceName = (arg + 12);

        } else if (strncmp(arg, "--", 2) != 0) {

            className.setTo(arg);

            className = arg;

            break;

        } else {

            --i;

cmds/bootanimation/BootAnimation.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ static bool readFile(ZipFileRO* zip, const char* name, String8& outString) { 
        return false;

    }



    outString.setTo((char const*)entryMap->getDataPtr(), entryMap->getDataLength());

    outString = String8((char const*)entryMap->getDataPtr(), entryMap->getDataLength());

    delete entryMap;

    return true;

}
@@ -1304,7 +1304,7 @@ bool BootAnimation::preloadZip(Animation& animation) { 
                                    part.audioData = (uint8_t *)map->getDataPtr();

                                    part.audioLength = map->getDataLength();

                                } else if (leaf == "trim.txt") {

                                    part.trimData.setTo((char const*)map->getDataPtr(),

                                    part.trimData = String8((char const*)map->getDataPtr(),

                                                        map->getDataLength());

                                } else {

                                    Animation::Frame frame;
@@ -1394,7 +1394,7 @@ bool BootAnimation::movie() { 
    if (!exts) {

        glGetError();

    } else {

        gl_extensions.setTo(exts);

        gl_extensions = exts;

        if ((gl_extensions.find("GL_ARB_texture_non_power_of_two") != -1) ||

            (gl_extensions.find("GL_OES_texture_npot") != -1)) {

            mUseNpotTextures = true;

core/jni/android_database_CursorWindow.cpp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static jlong nativeCreate(JNIEnv* env, jclass clazz, jstring nameObj, jint curso 
    CursorWindow* window;



    const char* nameStr = env->GetStringUTFChars(nameObj, NULL);

    name.setTo(nameStr);

    name = nameStr;

    env->ReleaseStringUTFChars(nameObj, nameStr);



    if (cursorWindowSize < 0) {

libs/androidfw/ResourceTypes.cpp

+4 −4
Original line number Diff line number Diff line
@@ -6229,13 +6229,13 @@ bool ResTable::collectString(String16* outString, 
        if (append) {

            outString->append(tmp);

        } else {

            outString->setTo(tmp);

            *outString = tmp;

        }

    } else {

        if (append) {

            outString->append(String16(s, len));

        } else {

            outString->setTo(s, len);

            *outString = String16(s, len);

        }

    }
@@ -7438,10 +7438,10 @@ bool ResTable::getIdmapInfo(const void* idmap, size_t sizeBytes, 
        *pOverlayCrc = dtohl(map[3]);

    }

    if (pTargetPath) {

        pTargetPath->setTo(reinterpret_cast<const char*>(map + 4));

        *pTargetPath = reinterpret_cast<const char*>(map + 4);

    }

    if (pOverlayPath) {

        pOverlayPath->setTo(reinterpret_cast<const char*>(map + 4 + 256 / sizeof(uint32_t)));

        *pOverlayPath = reinterpret_cast<const char*>(map + 4 + 256 / sizeof(uint32_t));

    }

    return true;

}

libs/hwui/RenderNode.h

+2 −2
Original line number Diff line number Diff line
@@ -120,9 +120,9 @@ public: 
        if (name) {

            const char* lastPeriod = strrchr(name, '.');

            if (lastPeriod) {

                mName.setTo(lastPeriod + 1);

                mName = (lastPeriod + 1);

            } else {

                mName.setTo(name);

                mName = name;

            }

        }

    }