Cleaning Manifest and re-adding systrace.
Change-Id: I1ed1e07df79aace07e2dbd520d77d0dee9c3cef8
diff --git a/suite/pts/deviceTests/ui/AndroidManifest.xml b/suite/pts/deviceTests/ui/AndroidManifest.xml
index 839e8aa..2a74791 100644
--- a/suite/pts/deviceTests/ui/AndroidManifest.xml
+++ b/suite/pts/deviceTests/ui/AndroidManifest.xml
@@ -26,17 +26,13 @@
<activity
android:name=".ScrollingActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
- android:screenOrientation="portrait" >
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity
- android:name="android.openglperf.cts.GlPlanetsActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" />
</application>
<instrumentation
diff --git a/suite/pts/hostTests/jank/app/src/com/android/pts/jank/opengl/PtsDeviceJankOpenGl.java b/suite/pts/hostTests/jank/app/src/com/android/pts/jank/opengl/PtsDeviceJankOpenGl.java
index 0a5fea7..715de4b 100644
--- a/suite/pts/hostTests/jank/app/src/com/android/pts/jank/opengl/PtsDeviceJankOpenGl.java
+++ b/suite/pts/hostTests/jank/app/src/com/android/pts/jank/opengl/PtsDeviceJankOpenGl.java
@@ -83,8 +83,7 @@
sleep(SLEEP_TIME / 2);
// Start systrace
- // TODO(jgennis): Systrace has been commented out because of read-tgid permission error
- // startTrace(mTestCaseName, i);
+ startTrace(mTestCaseName, i);
// Clear SurfaceFlinger buffer
Log.i(TAG, "Clearing SurfaceFlinger buffer");
@@ -99,7 +98,7 @@
assertTrue("SurfaceFlingerHelper could not get timestamps", result);
// Stop systrace
- // endTrace();
+ endTrace();
// Record results
recordResults(mTestCaseName, i);
diff --git a/suite/pts/hostTests/jank/app/src/com/android/pts/jank/ui/PtsDeviceJankUi.java b/suite/pts/hostTests/jank/app/src/com/android/pts/jank/ui/PtsDeviceJankUi.java
index ef3d738f..02d466e 100644
--- a/suite/pts/hostTests/jank/app/src/com/android/pts/jank/ui/PtsDeviceJankUi.java
+++ b/suite/pts/hostTests/jank/app/src/com/android/pts/jank/ui/PtsDeviceJankUi.java
@@ -30,8 +30,7 @@
private final static int NUM_ELEMENTS = 1000;
private static String APP_WINDOW_NAME = COMPONENT;
- // TODO(stuartscott): expand deviceTests/ui app to have a more complex UI, such as fragments.
-
+ // TODO(stuartscott): expand deviceTests/ui app to have a more complex UI
/**
* Runs the ScrollingActivity and measures jank during a scroll.
*/
@@ -60,8 +59,7 @@
new UiSelector().className(ListView.class.getName()));
// Start systrace
- // TODO(jgennis): Systrace has been commented out because of read-tgid permission error
- // startTrace(mTestCaseName, i);
+ startTrace(mTestCaseName, i);
// Clear SurfaceFlinger buffer
Log.i(TAG, "Clearing SurfaceFlinger buffer");
@@ -75,7 +73,7 @@
assertTrue("SurfaceFlingerHelper could not get timestamps", result);
// Stop systrace
- // endTrace();
+ endTrace();
// Record results
recordResults(mTestCaseName, i);
