diff options
author | Yabin Cui <yabinc@google.com> | 2020-04-07 17:20:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-07 17:20:01 +0000 |
commit | 80cd87a60222701044f423f1f8e0fef8672a851c (patch) | |
tree | 6b6c42e543d0d9a33efdb555a234a7dd1425e4d9 | |
parent | 30d0020380f5e688a6d6107eead9b1f9e7815f2a (diff) | |
parent | bcf045413b6760d6a31a8fdfb85b22b7854d12df (diff) | |
download | extras-80cd87a60222701044f423f1f8e0fef8672a851c.tar.gz |
simpleperf: fix CanRecordRawData. am: bcf045413b
Change-Id: I728bfe8faf614637f1024b459eb78bfefdd0394e
-rw-r--r-- | simpleperf/environment.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/simpleperf/environment.cpp b/simpleperf/environment.cpp index e16e496f..5b2fcaa8 100644 --- a/simpleperf/environment.cpp +++ b/simpleperf/environment.cpp @@ -299,18 +299,15 @@ bool CanRecordRawData() { if (IsRoot()) { return true; } - int value; - if (!ReadPerfEventParanoid(&value) || value > -1) { - return false; - } #if defined(__ANDROID__) - // If perf_event_open() is controlled by selinux, simpleperf can't record tracepoint raw data - // unless running as root. - if (android::base::GetProperty("sys.init.perf_lsm_hooks", "") == "1") { - return false; - } + // Android R uses selinux to control perf_event_open. Whether raw data can be recorded is hard + // to check unless we really try it. And probably there is no need to record raw data in non-root + // users. + return false; +#else + int value; + return ReadPerfEventParanoid(&value) && value == -1; #endif - return true; } static const char* GetLimitLevelDescription(int limit_level) { |