diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2017-06-21 15:03:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-06-21 15:03:38 +0000 |
| commit | 9e70003a8bb863aea55c8790f525c68b06c57799 (patch) | |
| tree | e1a54642d8ee94f8e67df19e9d8f53af11664c81 | |
| parent | c23e98e2e288045022db3f953bea59586cf03411 (diff) | |
| parent | cbecf779093847966a46a93a28ca6246f3dd4e5b (diff) | |
| download | cts-android-cts-7.0_r11.tar.gz | |
Merge "release-request-2dbbc443-c9b2-4c28-8082-4fdae4582e7c-for-aosp-nougat-cts-release-4118159 snap-temp-L79500000076205558" into nougat-cts-releaseandroid-cts-7.0_r11
4 files changed, 16 insertions, 3 deletions
diff --git a/tests/tests/content/Android.mk b/tests/tests/content/Android.mk index 98d067a1688..b27b99fb4a1 100644 --- a/tests/tests/content/Android.mk +++ b/tests/tests/content/Android.mk @@ -21,6 +21,9 @@ LOCAL_MODULE_TAGS := optional # 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/content/src/android/content/cts/ContentProviderCursorWindowTest.java b/tests/tests/content/src/android/content/cts/ContentProviderCursorWindowTest.java index 004b193bda1..e7714616728 100644 --- a/tests/tests/content/src/android/content/cts/ContentProviderCursorWindowTest.java +++ b/tests/tests/content/src/android/content/cts/ContentProviderCursorWindowTest.java @@ -19,6 +19,7 @@ package android.content.cts; import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.net.Uri; +import android.platform.test.annotations.SecurityTest; import android.test.AndroidTestCase; import android.util.Log; @@ -27,6 +28,7 @@ import java.io.IOException; /** * Test {@link CursorWindowContentProvider} . */ +@SecurityTest public class ContentProviderCursorWindowTest extends AndroidTestCase { private static final String TAG = "ContentProviderCursorWindowTest"; diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java index eaea24219ac..a208e10b4f1 100644 --- a/tests/tests/security/src/android/security/cts/StagefrightTest.java +++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java @@ -508,7 +508,11 @@ public class StagefrightTest extends InstrumentationTestCase { closeQuietly(fd); } } else { - ex.setDataSource(url); + try { + ex.setDataSource(url); + } catch (Exception e) { + // indicative of problems with our tame CTS test web server + } } MediaCodecList codecList = new MediaCodecList(MediaCodecList.REGULAR_CODECS); int numtracks = ex.getTrackCount(); @@ -665,7 +669,11 @@ public class StagefrightTest extends InstrumentationTestCase { 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(); diff --git a/tools/cts-tradefed/DynamicConfig.xml b/tools/cts-tradefed/DynamicConfig.xml index 70d1a392203..ffcf17ca1b8 100644 --- a/tools/cts-tradefed/DynamicConfig.xml +++ b/tools/cts-tradefed/DynamicConfig.xml @@ -15,6 +15,6 @@ <dynamicConfig> <entry key="media_files_url"> - <value>https://dl.google.com/dl/android/cts/android-cts-media-1.2.zip</value> + <value>https://dl.google.com/dl/android/cts/android-cts-media-1.3.zip</value> </entry> </dynamicConfig> |