Snap for 7542710 from b0eecadde94f5da467b923e94e05157d8c0d536e to sc-release (72e8e956) · Commits · e / os / android_frameworks_native-old

cmds/dumpstate/dumpstate.cpp

+9 −2

Original line number	Diff line number	Diff line
		@@ -1241,8 +1241,15 @@ static Dumpstate::RunStatus RunDumpsysTextByPriority(const std::string& title, i
		if (status == OK) {
		dumpsys.writeDumpHeader(STDOUT_FILENO, service, priority);
		std::chrono::duration<double> elapsed_seconds;
		if (priority == IServiceManager::DUMP_FLAG_PRIORITY_HIGH &&
		service == String16("meminfo")) {
		// Use a longer timeout for meminfo, since 30s is not always enough.
		status = dumpsys.writeDump(STDOUT_FILENO, service, 60s,
		/* as_proto = */ false, elapsed_seconds, bytes_written);
		} else {
		status = dumpsys.writeDump(STDOUT_FILENO, service, service_timeout,
		/* as_proto = */ false, elapsed_seconds, bytes_written);
		}
		dumpsys.writeDumpFooter(STDOUT_FILENO, service, elapsed_seconds);
		bool dump_complete = (status == OK);
		dumpsys.stopDumpThread(dump_complete);

+3 −3

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@
		#include <log/log.h> // TODO: Move everything to base/logging.
		#include <openssl/sha.h>
		#include <private/android_filesystem_config.h>
		#include <processgroup/sched_policy.h>
		#include <processgroup/processgroup.h>
		#include <selinux/android.h>
		#include <server_configurable_flags/get_flags.h>
		#include <system/thread_defs.h>
		@@ -282,8 +282,8 @@ static bool ShouldUseSwapFileForDexopt() {

		static void SetDex2OatScheduling(bool set_to_bg) {
		if (set_to_bg) {
		if (set_sched_policy(0, SP_BACKGROUND) < 0) {
		PLOG(ERROR) << "set_sched_policy failed";
		if (!SetTaskProfiles(0, {"Dex2OatBootComplete"})) {
		LOG(ERROR) << "Failed to set dex2oat task profile";
		exit(DexoptReturnCodes::kSetSchedPolicy);
		}
		if (setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_BACKGROUND) < 0) {