diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-25 02:37:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-25 02:37:31 +0000 |
| commit | e3cda970bb5ee9c0fe065ae70b891f24ebb03aeb (patch) | |
| tree | 3986fd0ca012b035c4ca875c199c7e4fa56cd866 | |
| parent | 128de789f062d3cece961bfcf7b495a3568ad617 (diff) | |
| parent | 4f9f834031d60a55ba10ae5a7093bda4cc0bf666 (diff) | |
| download | cts-e3cda970bb5ee9c0fe065ae70b891f24ebb03aeb.tar.gz | |
Merge cherrypicks of [15671342, 15671402, 15670951, 15671362, 15671363, 15671364, 15671365, 15671366, 15671343, 15671344, 15671345, 15671346, 15671347, 15671367, 15671368, 15671369, 15671370] into sc-d1-release
Change-Id: I9df7e3c9c1258ef6d14580b8eb59156d4b3fae0b
| -rw-r--r-- | tests/tests/provider/preconditions/Android.bp | 3 | ||||
| -rw-r--r-- | tests/tests/provider/src/android/provider/cts/media/MediaStoreTest.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/tests/provider/preconditions/Android.bp b/tests/tests/provider/preconditions/Android.bp index 289aab5b1ea..f636464db68 100644 --- a/tests/tests/provider/preconditions/Android.bp +++ b/tests/tests/provider/preconditions/Android.bp @@ -14,7 +14,8 @@ java_test_helper_library { test_suites: [ "cts", "general-tests", - "sts" + "sts", + "mts" ], host_supported: true, device_supported: false, diff --git a/tests/tests/provider/src/android/provider/cts/media/MediaStoreTest.java b/tests/tests/provider/src/android/provider/cts/media/MediaStoreTest.java index ed33af85f11..baeca9ceea6 100644 --- a/tests/tests/provider/src/android/provider/cts/media/MediaStoreTest.java +++ b/tests/tests/provider/src/android/provider/cts/media/MediaStoreTest.java @@ -266,6 +266,7 @@ public class MediaStoreTest { } @Test + @SdkSuppress(minSdkVersion = 31, codeName = "S") public void testCanManageMedia() throws Exception { final String opString = AppOpsManager.permissionToOp(Manifest.permission.MANAGE_MEDIA); |