simpleperf: add test to app recording api.

1. Modify app_api code to work with new perf event limit in R.
2. Modify demo code to exit after recording. So they can be used
   to generate test apks directly. Use cpu-clock in demo code to
   pass presubmit test.
3. Add api tests in cmd_api_test.cpp.

Bug: none
Test: run simpleperf_unit_test.
Change-Id: I37d786a2f6bdc2af1d807b91796484c58f309e2c

2 files changed, 16 insertions, 6 deletions

diff --git a/simpleperf/app_api/cpp/simpleperf.cpp b/simpleperf/app_api/cpp/simpleperf.cpp
index 54b331a3..71216fa0 100644
--- a/simpleperf/app_api/cpp/simpleperf.cpp
+++ b/simpleperf/app_api/cpp/simpleperf.cpp
@@ -359,8 +359,14 @@ std::string ProfileSessionImpl::FindSimpleperfInTempDir() {
   if (!RunCmd({"/system/bin/cp", path.c_str(), to_path.c_str()}, nullptr)) {
     return "";
   }
-  // For apps with target sdk >= 29, executing app data file isn't allowed. So test executing it.
-  if (!RunCmd({to_path.c_str()}, nullptr)) {
+  // For apps with target sdk >= 29, executing app data file isn't allowed.
+  // For android R, app context isn't allowed to use perf_event_open.
+  // So test executing downloaded simpleperf.
+  std::string s;
+  if (!RunCmd({to_path.c_str(), "list", "sw"}, &s)) {
+    return "";
+  }
+  if (s.find("cpu-clock") == std::string::npos) {
     return "";
   }
   return to_path;
diff --git a/simpleperf/app_api/java/com/android/simpleperf/ProfileSession.java b/simpleperf/app_api/java/com/android/simpleperf/ProfileSession.java
index cb0eac3d..1c512c63 100644
--- a/simpleperf/app_api/java/com/android/simpleperf/ProfileSession.java
+++ b/simpleperf/app_api/java/com/android/simpleperf/ProfileSession.java
@@ -248,12 +248,16 @@ public class ProfileSession {
         if (!isExecutableFile(toPath)) {
             return null;
         }
-        // For apps with target sdk >= 29, executing app data file isn't allowed. So test executing
-        // it.
+        // For apps with target sdk >= 29, executing app data file isn't allowed.
+        // For android R, app context isn't allowed to use perf_event_open.
+        // So test executing downloaded simpleperf.
         try {
-            Process process = new ProcessBuilder()
-                    .command(toPath).start();
+            Process process = new ProcessBuilder().command(toPath + "list sw").start();
             process.waitFor();
+            String data = readInputStream(process.getInputStream());
+            if (data.indexOf("cpu-clock") == -1) {
+                return null;
+            }
         } catch (Exception e) {
             return null;
         }