Merge "Fix inappropriate instruction code for AccessControlTest" into stage-aosp-pi-cts-dev
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
index 9511b16..9767530 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
@@ -261,6 +261,7 @@
workStatusIcon,
R.drawable.stat_sys_managed_profile_status);
+ /* Disable due to b/111734436.
Intent workStatusToast = new Intent(WorkStatusTestActivity.ACTION_WORK_STATUS_TOAST);
workStatusToast.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mWorkStatusBarToastTest = new DialogTestListItem(this,
@@ -268,6 +269,7 @@
"BYOD_WorkStatusBarToastTest",
R.string.provisioning_byod_work_status_toast_instruction,
workStatusToast);
+ */
mDisableNonMarketTest = new DialogTestListItem(this,
R.string.provisioning_byod_nonmarket_deny,
@@ -459,7 +461,10 @@
adapter.add(mWorkNotificationBadgedTest);
adapter.add(mWorkStatusBarIconTest);
+
+ /* Disable due to b/111734436.
adapter.add(mWorkStatusBarToastTest);
+ */
// Settings related tests.
adapter.add(mProfileAccountVisibleTest);
diff --git a/tests/tests/keystore/src/android/keystore/cts/CipherTest.java b/tests/tests/keystore/src/android/keystore/cts/CipherTest.java
index 88a59fe..66404b2 100644
--- a/tests/tests/keystore/src/android/keystore/cts/CipherTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/CipherTest.java
@@ -69,36 +69,38 @@
private static final String EXPECTED_PROVIDER_NAME = TestUtils.EXPECTED_CRYPTO_OP_PROVIDER_NAME;
- private static String[] EXPECTED_ALGORITHMS = {
- "AES/ECB/NoPadding",
- "AES/ECB/PKCS7Padding",
- "AES/CBC/NoPadding",
- "AES/CBC/PKCS7Padding",
- "AES/CTR/NoPadding",
- "AES/GCM/NoPadding",
- "RSA/ECB/NoPadding",
- "RSA/ECB/PKCS1Padding",
- "RSA/ECB/OAEPPadding",
- "RSA/ECB/OAEPWithSHA-1AndMGF1Padding",
- "RSA/ECB/OAEPWithSHA-224AndMGF1Padding",
- "RSA/ECB/OAEPWithSHA-256AndMGF1Padding",
- "RSA/ECB/OAEPWithSHA-384AndMGF1Padding",
- "RSA/ECB/OAEPWithSHA-512AndMGF1Padding"
- };
+ private static final String[] BASE_EXPECTED_ALGORITHMS = {
+ "AES/ECB/NoPadding",
+ "AES/ECB/PKCS7Padding",
+ "AES/CBC/NoPadding",
+ "AES/CBC/PKCS7Padding",
+ "AES/CTR/NoPadding",
+ "AES/GCM/NoPadding",
+ "RSA/ECB/NoPadding",
+ "RSA/ECB/PKCS1Padding",
+ "RSA/ECB/OAEPPadding",
+ "RSA/ECB/OAEPWithSHA-1AndMGF1Padding",
+ "RSA/ECB/OAEPWithSHA-224AndMGF1Padding",
+ "RSA/ECB/OAEPWithSHA-256AndMGF1Padding",
+ "RSA/ECB/OAEPWithSHA-384AndMGF1Padding",
+ "RSA/ECB/OAEPWithSHA-512AndMGF1Padding"
+ };
- private static final String[] DESEDE_ALGORITHMS = {
- "DESede/CBC/NoPadding",
- "DESede/CBC/PKCS7Padding",
- "DESede/ECB/NoPadding",
- "DESede/ECB/PKCS7Padding",
- };
+ private static final String[] DESEDE_ALGORITHMS = {
+ "DESede/CBC/NoPadding",
+ "DESede/CBC/PKCS7Padding",
+ "DESede/ECB/NoPadding",
+ "DESede/ECB/PKCS7Padding",
+ };
- {
- if (TestUtils.supports3DES()) {
- EXPECTED_ALGORITHMS = ObjectArrays
- .concat(EXPECTED_ALGORITHMS, DESEDE_ALGORITHMS, String.class);
+ private static String[] EXPECTED_ALGORITHMS = BASE_EXPECTED_ALGORITHMS;
+
+ static {
+ if (TestUtils.supports3DES()) {
+ EXPECTED_ALGORITHMS = ObjectArrays
+ .concat(BASE_EXPECTED_ALGORITHMS, DESEDE_ALGORITHMS, String.class);
+ }
}
- }
private static class KatVector {
private final byte[] plaintext;
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java b/tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java
index 0748bfb..b54a5e5 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java
@@ -257,7 +257,7 @@
documents.mkdirs();
assertTrue(documents.isDirectory());
- mFile = new File(documents, "test.txt");
+ mFile = new File(documents, "test.jpg");
try (OutputStream os = new FileOutputStream(mFile)) {
os.write(CONTENT.getBytes());
}
@@ -266,7 +266,7 @@
MediaScannerConnection.scanFile(
mActivity,
new String[]{ mFile.getAbsolutePath() },
- new String[]{ "plain/text" },
+ new String[]{ "image/jpeg" },
(String path, Uri uri) -> onScanCompleted(uri, latch)
);
assertTrue(
