diff options
| author | Manjae Park <manjaepark@google.com> | 2021-03-11 22:55:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-11 22:55:11 +0000 |
| commit | 79775d47403d750adea8cb769c5d0261cff12262 (patch) | |
| tree | 90ee5ac9b1b1902507071d8bc28c0a3a8eb71341 | |
| parent | 415fea0866d65e4ad0f04a737ef6c27be754648e (diff) | |
| parent | b2c962537360e5f1a6a7c965a3b97eb504e4a6bf (diff) | |
| download | cts-79775d47403d750adea8cb769c5d0261cff12262.tar.gz | |
resolve merge conflicts of b7173f4708cf445f9a986926c61b5a9354261d15 to pi-dev am: 4351b0b41c am: b2c9625373
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/13840753
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6edc6e4ee62b7913a91ea6c70937e6b0cdccf44
| -rw-r--r-- | tests/tests/security/src/android/security/cts/CertificateData.java | 2 | ||||
| -rw-r--r-- | tests/tests/security/src/android/security/cts/CertificateTest.java | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/tests/tests/security/src/android/security/cts/CertificateData.java b/tests/tests/security/src/android/security/cts/CertificateData.java index ef2722211f8..2b1c02a6dcc 100644 --- a/tests/tests/security/src/android/security/cts/CertificateData.java +++ b/tests/tests/security/src/android/security/cts/CertificateData.java @@ -17,14 +17,12 @@ */ package android.security.cts; -import android.platform.test.annotations.SecurityTest; /** * Run "./cts/tools/utils/java-cert-list-generator.sh > * cts/tests/tests/security/src/android/security/cts/CertificateData.java" * to generate this file. */ -@SecurityTest class CertificateData { static final String[] CERTIFICATE_DATA = { "91:C6:D6:EE:3E:8A:C8:63:84:E5:48:C2:99:29:5C:75:6C:81:7B:81", diff --git a/tests/tests/security/src/android/security/cts/CertificateTest.java b/tests/tests/security/src/android/security/cts/CertificateTest.java index 2588f4db751..adc14de4689 100644 --- a/tests/tests/security/src/android/security/cts/CertificateTest.java +++ b/tests/tests/security/src/android/security/cts/CertificateTest.java @@ -20,7 +20,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import android.content.pm.PackageManager; -import android.platform.test.annotations.SecurityTest; import android.test.AndroidTestCase; import java.security.KeyStore; import java.security.KeyStoreException; @@ -37,7 +36,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -@SecurityTest public class CertificateTest extends AndroidTestCase { // The directory for CA root certificates trusted by WFA (WiFi Alliance) static final String DIR_OF_CACERTS_FOR_WFA = "/etc/security/cacerts_wfa"; |