commit 63dab7cebd68e55cc2778f3eb4e8ba1a8ed053d4
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 16 18:08:18 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 16 18:08:18 2017 +0000
tree e01f2559885eb19c50ec8019e33b623b5e9e3095
parent eed6d156aa3d004276db8bb3f07844c68244550b
parent 83b360bfe08980d07119781a44dac49eacbb31eb

Merge "Add security test annotation for SkiaICORecursiveDecodingTest" into nougat-cts-dev

tests/tests/security/src/android/security/cts/SkiaICORecursiveDecodingTest.java

diff --git a/tests/tests/security/src/android/security/cts/SkiaICORecursiveDecodingTest.java b/tests/tests/security/src/android/security/cts/SkiaICORecursiveDecodingTest.java
index 3c937670..7c719fd 100644
--- a/tests/tests/security/src/android/security/cts/SkiaICORecursiveDecodingTest.java
+++ b/tests/tests/security/src/android/security/cts/SkiaICORecursiveDecodingTest.java
@@ -23,13 +23,16 @@
 import java.io.InputStream;
 
 import android.security.cts.R;
+import android.platform.test.annotations.SecurityTest;
 
 public class SkiaICORecursiveDecodingTest extends AndroidTestCase {
 
+    @SecurityTest
     public void test_android_bug_17262540() {
         doSkiaIcoRecursiveDecodingTest(R.raw.bug_17262540);
     }
 
+    @SecurityTest
     public void test_android_bug_17265466() {
         doSkiaIcoRecursiveDecodingTest(R.raw.bug_17265466);
     }