summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-05-17 07:28:41 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-05-17 07:28:43 +0000
commit61e58d5a47cf660972dddb68643f15e4599fe5e1 (patch)
tree35f513fc1f2c9738064b776c8fbac7b78b0836ea
parent3a6828d50b3b90b92a4ea1deddec4cc4b19e0604 (diff)
parent4a9dda11db6a98543651335a4c728dfce58d272a (diff)
downloadnative-n-iot-preview-4.tar.gz
Merge "Make the binder_lock category optional"android-n-iot-preview-4n-iot-preview-4
-rw-r--r--cmds/atrace/atrace.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index add5285ee3..1883a96b33 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -181,9 +181,9 @@ static const TracingCategory k_categories[] = {
{ REQ, "events/binder/binder_transaction_received/enable" },
} },
{ "binder_lock", "Binder global lock trace", 0, {
- { REQ, "events/binder/binder_lock/enable" },
- { REQ, "events/binder/binder_locked/enable" },
- { REQ, "events/binder/binder_unlock/enable" },
+ { OPT, "events/binder/binder_lock/enable" },
+ { OPT, "events/binder/binder_locked/enable" },
+ { OPT, "events/binder/binder_unlock/enable" },
} },
{ "pagecache", "Page cache", 0, {
{ REQ, "events/filemap/enable" },
@@ -371,7 +371,7 @@ static bool isCategorySupported(const TracingCategory& category)
ok = true;
}
} else {
- ok |= fileIsWritable(path);
+ ok = true;
}
}
}