Merge "Remove unused rename code" (5964d5a4) · Commits · e / os / android_frameworks_native-old

cmds/dumpstate/dumpstate.cpp

+1 −12

Original line number	Diff line number	Diff line
		@@ -1100,7 +1100,7 @@ static void RunDumpsysProto(const std::string& title, int priority,
		}
		}

		// Runs dumpsys on services that must dump first and and will take less than 100ms to dump.
		// Runs dumpsys on services that must dump first and will take less than 100ms to dump.
		static void RunDumpsysCritical() {
		RunDumpsysText("DUMPSYS CRITICAL", IServiceManager::DUMP_FLAG_PRIORITY_CRITICAL,
		/* timeout= / 5s, / service_timeout= */ 500ms);
		@@ -1858,17 +1858,6 @@ static void FinalizeFile() {
		do_text_file = true;
		} else {
		do_text_file = false;
		// Since zip file is already created, it needs to be renamed.
		std::string new_path = ds.GetPath(".zip");
		if (ds.path_ != new_path) {
		MYLOGD("Renaming zip file from %s to %s\n", ds.path_.c_str(), new_path.c_str());
		if (rename(ds.path_.c_str(), new_path.c_str())) {
		MYLOGE("rename(%s, %s): %s\n", ds.path_.c_str(), new_path.c_str(),
		strerror(errno));
		} else {
		ds.path_ = new_path;
		}
		}
		}
		}
		if (do_text_file) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -261,7 +261,7 @@ class Dumpstate {
		std::chrono::milliseconds timeout);

		/*
		* Adds a text entry entry to the existing zip file.
		* Adds a text entry to the existing zip file.
		*/
		bool AddTextZipEntry(const std::string& entry_name, const std::string& content);