diff options
-rw-r--r-- | perfetto.rc | 2 | ||||
-rw-r--r-- | test/test_helper.h | 2 | ||||
-rw-r--r-- | traced_perf.rc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/perfetto.rc b/perfetto.rc index e8762fb74..11cc42e9f 100644 --- a/perfetto.rc +++ b/perfetto.rc @@ -27,7 +27,7 @@ service traced_probes /system/bin/traced_probes user nobody # Despite the "log" group below, traced_probes is allowed to read log # only on userdebug/eng via selinux (see traced_probes.te). - group nobody readproc log + group nobody readproc log readtracefs writepid /dev/cpuset/system-background/tasks # Clean up procfs configuration even if traced_probes crashes # unexpectedly. diff --git a/test/test_helper.h b/test/test_helper.h index 9f03bb6e2..4ac4c46b1 100644 --- a/test/test_helper.h +++ b/test/test_helper.h @@ -48,7 +48,7 @@ namespace perfetto { // This value has been bumped to 10s in Oct 2020 because the x86 cuttlefish // emulator is sensibly slower (up to 10x) than real hw and caused flakes. // See bugs duped against b/171771440. -constexpr uint32_t kDefaultTestTimeoutMs = 30000; +constexpr uint32_t kDefaultTestTimeoutMs = 10000; // This is used only in daemon starting integrations tests. class ServiceThread { diff --git a/traced_perf.rc b/traced_perf.rc index 692977cda..cc8d4e872 100644 --- a/traced_perf.rc +++ b/traced_perf.rc @@ -25,7 +25,7 @@ service traced_perf /system/bin/traced_perf disabled socket traced_perf stream 0666 root root user nobody - group nobody readproc + group nobody readproc readtracefs capabilities KILL DAC_READ_SEARCH writepid /dev/cpuset/foreground/tasks |