commit 28906a564e9244940c33350c74b2f1e8bd8b3449
author Carmen Jackson <carmenjackson@google.com> Wed Dec 19 00:37:07 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 19 00:37:07 2018 -0800
tree c32e7fa1cdd05415303e66ca8c3148a08005de7b
parent 76b6c62c80a42e14caa567ca5ea90656a69c8e30
parent 9b394f52b921d56523393641669ad866f81bb6df

Merge changes Iee2984f7,I18a3fd8a am: a1d7b197b8
am: 9b394f52b9

Change-Id: Ib935d918cda048dc1a4a3c79950292e43664b742

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 19c2830..53b3a00 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -228,6 +228,10 @@
         { 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 @@
         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;
             }
         }
     }