commit a9b79909a0632ef04f4a63e08ed6ba2130405585
author Jeff Sharkey <jsharkey@android.com> Tue Sep 17 13:32:34 2013 -0700
committer The Android Automerger <android-build@android.com> Tue Sep 17 15:29:59 2013 -0700
tree ed75329589afd24f836e1b93d047bcaa6e5d1dd7
parent 09bb7c427a86c8d4f4230ff2576d59de0d56829e

Fix android.os CTS tests.

InstrumentationCtsTestRunner is magic, and I made it unhappy.  Switch
it back, and use explicit package names when running PFD tests.

Bug: 10668465
Change-Id: Ic5bafebcf6c2828cd281f9121c8f87170a831f58

tests/tests/os/Android.mk

diff --git a/tests/tests/os/Android.mk b/tests/tests/os/Android.mk
index a5d5d74..f43043b 100644
--- a/tests/tests/os/Android.mk
+++ b/tests/tests/os/Android.mk
@@ -21,6 +21,8 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
+LOCAL_PROGUARD_ENABLED := disabled
+
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner guava

tests/tests/os/AndroidManifest.xml

diff --git a/tests/tests/os/AndroidManifest.xml b/tests/tests/os/AndroidManifest.xml
index 168d318..2418132 100644
--- a/tests/tests/os/AndroidManifest.xml
+++ b/tests/tests/os/AndroidManifest.xml
@@ -25,16 +25,17 @@
     <application>
         <service
             android:name="android.os.cts.ParcelFileDescriptorPeer$Red"
-            android:process=":red" />
+            android:process=":red"
+            android:exported="true" />
         <service
             android:name="android.os.cts.ParcelFileDescriptorPeer$Blue"
-            android:process=":blue" />
+            android:process=":blue"
+            android:exported="true" />
         <uses-library android:name="android.test.runner" />
     </application>
 
     <instrumentation android:name="android.test.InstrumentationCtsTestRunner"
-                     android:targetPackage="com.android.cts.os"
+                     android:targetPackage="com.android.cts.stub"
                      android:label="CTS tests of android.os"/>
 
 </manifest>
-

tests/tests/os/src/android/os/cts/ParcelFileDescriptorProcessTest.java

diff --git a/tests/tests/os/src/android/os/cts/ParcelFileDescriptorProcessTest.java b/tests/tests/os/src/android/os/cts/ParcelFileDescriptorProcessTest.java
index d7d3a15..679a35c 100644
--- a/tests/tests/os/src/android/os/cts/ParcelFileDescriptorProcessTest.java
+++ b/tests/tests/os/src/android/os/cts/ParcelFileDescriptorProcessTest.java
@@ -87,8 +87,12 @@
         final Context context = getContext();
 
         // Bring up both remote processes and wire them to each other
-        redIntent = new Intent(context, ParcelFileDescriptorPeer.Red.class);
-        blueIntent = new Intent(context, ParcelFileDescriptorPeer.Blue.class);
+        redIntent = new Intent();
+        redIntent.setComponent(new ComponentName(
+                "com.android.cts.os", "android.os.cts.ParcelFileDescriptorPeer$Red"));
+        blueIntent = new Intent();
+        blueIntent.setComponent(new ComponentName(
+                "com.android.cts.os", "android.os.cts.ParcelFileDescriptorPeer$Blue"));
         redConn = new PeerConnection();
         blueConn = new PeerConnection();
         context.startService(redIntent);