Merge "Make the binder_lock category optional" am: 61e58d5a47 (f06f26bb) · Commits · e / os / android_frameworks_native-old

cmds/atrace/atrace.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -181,9 +181,9 @@ static const TracingCategory k_categories[] = {
	{ REQ, "events/binder/binder_transaction_received/enable" },		{ REQ, "events/binder/binder_transaction_received/enable" },
	} },		} },
	{ "binder_lock", "Binder global lock trace", 0, {		{ "binder_lock", "Binder global lock trace", 0, {
	{ REQ, "events/binder/binder_lock/enable" },		{ OPT, "events/binder/binder_lock/enable" },
	{ REQ, "events/binder/binder_locked/enable" },		{ OPT, "events/binder/binder_locked/enable" },
	{ REQ, "events/binder/binder_unlock/enable" },		{ OPT, "events/binder/binder_unlock/enable" },
	} },		} },
	{ "pagecache", "Page cache", 0, {		{ "pagecache", "Page cache", 0, {
	{ REQ, "events/filemap/enable" },		{ REQ, "events/filemap/enable" },
	@@ -371,7 +371,7 @@ static bool isCategorySupported(const TracingCategory& category)
	ok = true;		ok = true;
	}		}
	} else {		} else {
	ok \|= fileIsWritable(path);		ok = true;
	}		}
	}		}
	}		}