commit 61e58d5a47cf660972dddb68643f15e4599fe5e1
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 17 07:28:41 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 17 07:28:43 2017 +0000
tree 35f513fc1f2c9738064b776c8fbac7b78b0836ea
parent 3a6828d50b3b90b92a4ea1deddec4cc4b19e0604
parent 4a9dda11db6a98543651335a4c728dfce58d272a

Merge "Make the binder_lock category optional"

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index add5285..1883a96 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -181,9 +181,9 @@
         { 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 @@
                     ok = true;
                 }
             } else {
-                ok |= fileIsWritable(path);
+                ok = true;
             }
         }
     }