commit 2e4f99b270e7715fde8d3755e5553c244619c5d9
author Carmen Jackson <carmenjackson@google.com> Wed Dec 19 00:47:23 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 19 00:47:23 2018 -0800
tree e2c8fb1d3ebbb75ee2451dac1ad230b5fbd09962
parent e0ad36fd4567b505131e1a3a1f8d0b9cf19656c7
parent 28906a564e9244940c33350c74b2f1e8bd8b3449

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

Change-Id: Ife675ba0588a38035befc94f9f60af5b2b6a020c

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;
             }
         }
     }