Merge "release-request-4508f19d-e487-4105-a2ae-536ccb547bbf-for-aosp-marshmallow-cts-release-4118095 snap-temp-L45400000076205659" into marshmallow-cts-release
diff --git a/tests/tests/content/Android.mk b/tests/tests/content/Android.mk
index 7da666a..52bedce 100644
--- a/tests/tests/content/Android.mk
+++ b/tests/tests/content/Android.mk
@@ -21,6 +21,9 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+# Include both the 32 and 64 bit versions
+LOCAL_MULTILIB := both
+
LOCAL_JNI_SHARED_LIBRARIES := libnativecursorwindow_jni libnativehelper_compat_libc++
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/nativeopengl/AndroidManifest.xml b/tests/tests/nativeopengl/AndroidManifest.xml
index 72d87ac..95cbb30 100644
--- a/tests/tests/nativeopengl/AndroidManifest.xml
+++ b/tests/tests/nativeopengl/AndroidManifest.xml
@@ -22,7 +22,8 @@
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <application>
+ <!-- These tests can interfere with the hardware accelerated renderer -->
+ <application android:hardwareAccelerated="false">
<uses-library android:name="android.test.runner" />
<activity android:name="com.android.opengl.cts.GLTestActivity"/>
</application>
diff --git a/tests/tests/nativeopengl/standalone/AndroidManifest.xml b/tests/tests/nativeopengl/standalone/AndroidManifest.xml
index 9092f69..98b7780 100644
--- a/tests/tests/nativeopengl/standalone/AndroidManifest.xml
+++ b/tests/tests/nativeopengl/standalone/AndroidManifest.xml
@@ -29,7 +29,8 @@
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <application android:label="NativeGLTest">
+ <!-- These tests can interfere with the hardware accelerated renderer -->
+ <application android:label="NativeGLTest" android:hardwareAccelerated="false">
<activity android:name=".GLTestActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index 0a255b3..158dc7a 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -497,7 +497,11 @@
closeQuietly(fd);
}
} else {
- ex.setDataSource(url);
+ try {
+ ex.setDataSource(url);
+ } catch (Exception e) {
+ // indicative of problems with our tame CTS test web server
+ }
}
int numtracks = ex.getTrackCount();
String rname = url != null ? url: resources.getResourceEntryName(rid);
@@ -655,7 +659,11 @@
closeQuietly(fd);
}
} else {
- retriever.setDataSource(url, new HashMap<String, String>());
+ try {
+ retriever.setDataSource(url, new HashMap<String, String>());
+ } catch (Exception e) {
+ // indicative of problems with our tame CTS test web server
+ }
}
retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
retriever.getEmbeddedPicture();
