diff options
| author | Jing Ji <jji@google.com> | 2021-03-15 20:57:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-15 20:57:36 +0000 |
| commit | 3713b49ef556b3fc5f5f38aef36b5c95bd98e3ec (patch) | |
| tree | e49b34482ac59834dc2cf2577281eb5f6a29dba4 | |
| parent | fe6cfccf0ce68c41461d1634ae043e4439f295cd (diff) | |
| parent | 321e20468a1b56e9c4660609c5885ac1590dbe8d (diff) | |
| download | cts-3713b49ef556b3fc5f5f38aef36b5c95bd98e3ec.tar.gz | |
Merge "Resolve CtsSecurityTest issues introduced with CtsDeviceInfo" into rvc-dev
| -rw-r--r-- | tests/tests/security/AndroidTest.xml | 3 | ||||
| -rw-r--r-- | tests/tests/security/src/android/security/cts/PackageSignatureTest.java | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/tests/security/AndroidTest.xml b/tests/tests/security/AndroidTest.xml index 11a42986cd6..6e0c8bc4f69 100644 --- a/tests/tests/security/AndroidTest.xml +++ b/tests/tests/security/AndroidTest.xml @@ -17,7 +17,8 @@ <option name="test-suite-tag" value="cts" /> <option name="config-descriptor:metadata" key="component" value="security" /> <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" /> - <option name="config-descriptor:metadata" key="parameter" value="instant_app" /> + <!-- CtsDeviceInfo target API is 23; instant app requires target API >= 26. --> + <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" /> <option name="config-descriptor:metadata" key="parameter" value="secondary_user" /> <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> <option name="cleanup-apks" value="true" /> diff --git a/tests/tests/security/src/android/security/cts/PackageSignatureTest.java b/tests/tests/security/src/android/security/cts/PackageSignatureTest.java index 3aec3942631..c5234d614f6 100644 --- a/tests/tests/security/src/android/security/cts/PackageSignatureTest.java +++ b/tests/tests/security/src/android/security/cts/PackageSignatureTest.java @@ -148,7 +148,10 @@ public class PackageSignatureTest extends AndroidTestCase { "com.android.apex.cts.shim", // Oom Catcher package to prevent tests from ooming device. - "com.android.cts.oomcatcher" + "com.android.cts.oomcatcher", + + // Collects device info at the start of the test + "com.android.compatibility.common.deviceinfo" )); |