Merge changes Iee2984f7,I18a3fd8a am: a1d7b197b8 am: 9b394f52b9 (2e4f99b2) · Commits · e / os / platform_frameworks_native

cmds/atrace/atrace.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -228,6 +228,10 @@ static const TracingCategory k_categories[] = {
		{ OPT, "events/kmem/rss_stat/enable" },
		{ OPT, "events/kmem/ion_heap_grow/enable" },
		{ OPT, "events/kmem/ion_heap_shrink/enable" },
		{ OPT, "events/oom/oom_score_adj_update/enable" },
		{ OPT, "events/sched/sched_process_exit/enable" },
		{ OPT, "events/task/task_rename/enable" },
		{ OPT, "events/task/task_newtask/enable" },
		} },
		};

		@@ -435,14 +439,10 @@ static bool isCategorySupported(const TracingCategory& category)
		const char* path = category.sysfiles[i].path;
		bool req = category.sysfiles[i].required == REQ;
		if (path != nullptr) {
		if (req) {
		if (!fileIsWritable(path)) {
		return false;
		} else {
		ok = true;
		}
		} else {
		if (fileIsWritable(path)) {
		ok = true;
		} else if (req) {
		return false;
		}
		}
		}