CwPerformanceLaunch checked in to avoid sideload
PerformanceLaunch is a test apk used in hermetic app launch. It includes
several activities to launch during the test. In order to be compatiable
with the same test in EMR1, the activity styles need to be set to wear
specific. Since f-cw-dev no longer to merge into nyc-dev, this change
can be checked in to avoid sideloading.
bug:32748939
Change-Id: Ib2d2a49d97d604936abae8ebf725a3c601a1d550
diff --git a/tests/perf/PerformanceLaunch/AndroidManifest.xml b/tests/perf/PerformanceLaunch/AndroidManifest.xml
index 6d639ad..99ee3be 100644
--- a/tests/perf/PerformanceLaunch/AndroidManifest.xml
+++ b/tests/perf/PerformanceLaunch/AndroidManifest.xml
@@ -29,6 +29,7 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
+ android:debuggable="true"
android:theme="@style/AppTheme" >
<activity
android:name=".DispatchActivity"
diff --git a/tests/perf/PerformanceLaunch/res/values-round/styles.xml b/tests/perf/PerformanceLaunch/res/values-round/styles.xml
new file mode 100644
index 0000000..7c63606
--- /dev/null
+++ b/tests/perf/PerformanceLaunch/res/values-round/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+ <!--
+ Base application theme, dependent on API level. This theme is replaced
+ by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+ -->
+ <style name="AppBaseTheme" parent="android:Theme.Light">
+ <!--
+ Theme customizations available in newer API levels can go in
+ res/values-vXX/styles.xml, while customizations related to
+ backward-compatibility can go here.
+ -->
+ </style>
+
+ <!-- Application theme. -->
+ <style name="AppTheme" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen">
+ <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+ </style>
+
+</resources>
diff --git a/tests/perf/PerformanceLaunch/src/com/android/performanceLaunch/DispatchActivity.java b/tests/perf/PerformanceLaunch/src/com/android/performanceLaunch/DispatchActivity.java
index 4a3da34..7c42ce8 100644
--- a/tests/perf/PerformanceLaunch/src/com/android/performanceLaunch/DispatchActivity.java
+++ b/tests/perf/PerformanceLaunch/src/com/android/performanceLaunch/DispatchActivity.java
@@ -72,11 +72,11 @@
try {
mPid = android.os.Process.myPid();
ProcessBuilder simpleperf =
- new ProcessBuilder(mSimpleperfBin, "stat", "--group",
+ new ProcessBuilder(mSimpleperfBin, "stat",
mSimpleperfEvt, "-p", String.valueOf(mPid));
- simpleperf.redirectOutput(new File(String.format("%s/%s.%s",
- mSimpleperfDir, "perf.data", String.valueOf(mPid))));
+ simpleperf.redirectOutput(new File(String.format("%s/%s-%s",
+ mSimpleperfDir, mActivityName, String.valueOf(mPid))));
simpleperf.start();
} catch (Exception e) {
