Merge "Migrate String8|16.setTo to assignment operator" into main (c01e3ba0) · Commits · e / os / android_frameworks_base

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;

+3 −3

Original line number	Diff line number	Diff line
		@@ -1012,7 +1012,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;
		}
		@@ -1306,7 +1306,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;
		@@ -1396,7 +1396,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;

+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) {

+4 −4

Original line number	Diff line number	Diff line
		@@ -6190,13 +6190,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);
		}
		}

		@@ -7398,10 +7398,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;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -121,9 +121,9 @@ public:
		if (name) {
		const char* lastPeriod = strrchr(name, '.');
		if (lastPeriod) {
		mName.setTo(lastPeriod + 1);
		mName = (lastPeriod + 1);
		} else {
		mName.setTo(name);
		mName = name;
		}
		}
		}