commit 61681886b147603b27e696e9d4171ca31dd7bdcd
author Lalit Maganti <lalitm@google.com> Wed Mar 14 15:29:01 2018 +0000
committer Lalit Maganti <lalitm@google.com> Wed Mar 14 18:02:02 2018 +0000
tree ef2b03694de8893678d9515951622a019005c5c4
parent 2a6f904f7cf66eaeb6144896ad555049a8c8b34c

perfetto: try to fix CTS tests again

Bug: 70524267
Change-Id: Iecb4278b45e4aa3b7e360d6eca16a6361f95bb75

Android.bp

diff --git a/Android.bp b/Android.bp
index 64d6a50..b46c4aa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3273,8 +3273,8 @@
     "libprotobuf-cpp-lite",
   ],
   static_libs: [
+    "libgtest",
     "perfetto_src_tracing_ipc",
-    "libgtest_prod",
   ],
   cflags: [
     "-DPERFETTO_BUILD_WITH_ANDROID",
@@ -3295,6 +3295,7 @@
     ".",
   ],
   static_libs: [
+    "libgtest",
     "perfetto_src_tracing_ipc",
   ],
   cflags: [

Android.bp.extras

diff --git a/Android.bp.extras b/Android.bp.extras
index 0b8563f..a3f25d5 100644
--- a/Android.bp.extras
+++ b/Android.bp.extras
@@ -23,8 +23,8 @@
     "libprotobuf-cpp-lite",
   ],
   static_libs: [
+    "libgtest",
     "perfetto_src_tracing_ipc",
-    "libgtest_prod",
   ],
   cflags: [
     "-DPERFETTO_BUILD_WITH_ANDROID",
@@ -45,6 +45,7 @@
     ".",
   ],
   static_libs: [
+    "libgtest",
     "perfetto_src_tracing_ipc",
   ],
   cflags: [

test/cts/producer/jni/Android.bp

diff --git a/test/cts/producer/jni/Android.bp b/test/cts/producer/jni/Android.bp
index 3c82bef..aae7201 100644
--- a/test/cts/producer/jni/Android.bp
+++ b/test/cts/producer/jni/Android.bp
@@ -4,8 +4,9 @@
     "fake_producer_jni.cc",
   ],
   static_libs: [
-    "perfetto_cts_jni_deps",
+    "libgtest",
     "libprotobuf-cpp-lite",
+    "perfetto_cts_jni_deps",
     "perfetto_src_tracing_ipc",
   ],
   shared_libs: [

test/cts/producer/src/android/perfetto/producer/ProducerActivity.java

diff --git a/test/cts/producer/src/android/perfetto/producer/ProducerActivity.java b/test/cts/producer/src/android/perfetto/producer/ProducerActivity.java
index db652b0..2dfa0ce 100644
--- a/test/cts/producer/src/android/perfetto/producer/ProducerActivity.java
+++ b/test/cts/producer/src/android/perfetto/producer/ProducerActivity.java
@@ -19,26 +19,46 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
 
 public class ProducerActivity extends Activity {
+    private boolean paused = true;
+    private final Handler handler = new Handler();
+
     @Override
     public void onResume() {
         super.onResume();
 
-        startService(new Intent(this, ProducerService.class));
-        startService(new Intent(this, ProducerIsolatedService.class));
-
-        System.loadLibrary("perfettocts_jni");
-        new Thread(new Runnable() {
+        paused = false;
+        handler.post(new Runnable() {
+            @Override
             public void run() {
-                try {
-                    setupProducer();
-                } catch (Exception ex) {
-                    ex.printStackTrace();
+                if (paused) {
+                    return;
                 }
+
+                startService(new Intent(ProducerActivity.this, ProducerService.class));
+                startService(new Intent(ProducerActivity.this, ProducerIsolatedService.class));
+
+                System.loadLibrary("perfettocts_jni");
+                new Thread(new Runnable() {
+                    public void run() {
+                        try {
+                            setupProducer();
+                        } catch (Exception ex) {
+                            ex.printStackTrace();
+                        }
+                    }
+                })
+                        .start();
             }
-        })
-                .start();
+        });
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        paused = true;
     }
 
     private static native void setupProducer();