resolve merge conflicts of 6dabee4a94 to mnc-dev
Test: this test passes
Bug: 34031018
Change-Id: I76ac929d7cca256e9d7b73b26d0f5159bae1ef7d
diff --git a/tests/tests/security/res/raw/bug_34031018_32bit.xmf b/tests/tests/security/res/raw/bug_34031018_32bit.xmf
new file mode 100644
index 0000000..8f869ab
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_34031018_32bit.xmf
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_34031018_64bit.xmf b/tests/tests/security/res/raw/bug_34031018_64bit.xmf
new file mode 100644
index 0000000..4ddd28d
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_34031018_64bit.xmf
Binary files differ
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index 271bbce..2bc9cf2 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -198,6 +198,11 @@
doStagefrightTest(R.raw.cve_2016_2429_b_27211885);
}
+ public void testStagefright_bug_34031018() throws Exception {
+ doStagefrightTest(R.raw.bug_34031018_32bit);
+ doStagefrightTest(R.raw.bug_34031018_64bit);
+ }
+
/***********************************************************
to prevent merge conflicts, add M tests below this comment,
before any existing test methods
@@ -723,7 +728,7 @@
try {
retriever.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
fd.close();
- } catch (RuntimeException e) {
+ } catch (Exception e) {
// ignore
} finally {
closeQuietly(fd);