Merge "Change MTS CTS tests to desired config" into sc-dev
diff --git a/tests/Android.bp b/tests/Android.bp
index 43fe80f..0cf1a3b 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -9,6 +9,7 @@
"cts-install-lib",
],
sdk_version: "test_current",
+ target_sdk_version: "30",
min_sdk_version: "30",
test_suites: [
"device-tests",
@@ -27,6 +28,7 @@
"cts-install-lib",
],
sdk_version: "test_current",
+ target_sdk_version: "30",
min_sdk_version: "30",
test_suites: [
"device-tests",
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 48bb6aa..199f617 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -2,6 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.providers.media.tests">
+ <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30" />
+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
diff --git a/tests/src/com/android/providers/media/PermissionActivityTest.java b/tests/src/com/android/providers/media/PermissionActivityTest.java
index ce72d97..e019d65 100644
--- a/tests/src/com/android/providers/media/PermissionActivityTest.java
+++ b/tests/src/com/android/providers/media/PermissionActivityTest.java
@@ -46,6 +46,7 @@
import android.provider.MediaStore;
import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
import androidx.test.runner.AndroidJUnit4;
import com.android.providers.media.scan.MediaScannerTest;
@@ -97,6 +98,7 @@
}
@Test
+ @SdkSuppress(minSdkVersion = 31, codeName = "S")
public void testShouldShowActionDialog_noRESAndMES_true() throws Exception {
final String[] enableAppOpsList = {AppOpsManager.permissionToOp(MANAGE_MEDIA)};
final String[] disableAppOpsList = {
@@ -121,6 +123,7 @@
}
@Test
+ @SdkSuppress(minSdkVersion = 31, codeName = "S")
public void testShouldShowActionDialog_noMANAGE_MEDIA_true() throws Exception {
final String[] enableAppOpsList = {
AppOpsManager.permissionToOp(MANAGE_EXTERNAL_STORAGE),
@@ -145,6 +148,7 @@
}
@Test
+ @SdkSuppress(minSdkVersion = 31, codeName = "S")
public void testShouldShowActionDialog_hasPermissionWithRES_false() throws Exception {
final String[] enableAppOpsList = {
AppOpsManager.permissionToOp(MANAGE_MEDIA),
@@ -169,6 +173,7 @@
}
@Test
+ @SdkSuppress(minSdkVersion = 31, codeName = "S")
public void testShouldShowActionDialog_hasPermissionWithMES_false() throws Exception {
final String[] enableAppOpsList = {
AppOpsManager.permissionToOp(MANAGE_EXTERNAL_STORAGE),
@@ -193,6 +198,7 @@
}
@Test
+ @SdkSuppress(minSdkVersion = 31, codeName = "S")
public void testShouldShowActionDialog_writeNoACCESS_MEDIA_LOCATION_true() throws Exception {
final String[] enableAppOpsList = {
AppOpsManager.permissionToOp(MANAGE_EXTERNAL_STORAGE),
@@ -218,6 +224,7 @@
}
@Test
+ @SdkSuppress(minSdkVersion = 31, codeName = "S")
public void testShouldShowActionDialog_writeHasACCESS_MEDIA_LOCATION_false() throws Exception {
final String[] enableAppOpsList = {
AppOpsManager.permissionToOp(ACCESS_MEDIA_LOCATION),
diff --git a/tests/src/com/android/providers/media/TranscodeHelperTest.java b/tests/src/com/android/providers/media/TranscodeHelperTest.java
index 20d0f9d..0c2dc59 100644
--- a/tests/src/com/android/providers/media/TranscodeHelperTest.java
+++ b/tests/src/com/android/providers/media/TranscodeHelperTest.java
@@ -27,6 +27,7 @@
import android.provider.MediaStore;
import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
@@ -37,6 +38,7 @@
import java.util.Random;
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = 31, codeName = "S")
public class TranscodeHelperTest {
private static final String SOME_VALID_FILE_PATH =
"/storage/emulated/0/" + Environment.DIRECTORY_DCIM + "/Camera/some_filename.mp4";
diff --git a/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java b/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java
index 3d636cc..cc355d0 100644
--- a/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java
+++ b/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java
@@ -69,6 +69,7 @@
import android.util.Pair;
import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
import androidx.test.runner.AndroidJUnit4;
import com.android.providers.media.R;
@@ -801,6 +802,7 @@
}
@Test
+ @SdkSuppress(minSdkVersion = 31, codeName = "S")
public void testScan_audio_recording() throws Exception {
final File music = new File(mDir, "Recordings");
final File audio = new File(music, "audio.mp3");
diff --git a/tests/src/com/android/providers/media/util/PermissionUtilsTest.java b/tests/src/com/android/providers/media/util/PermissionUtilsTest.java
index da89b5c..7facf05 100644
--- a/tests/src/com/android/providers/media/util/PermissionUtilsTest.java
+++ b/tests/src/com/android/providers/media/util/PermissionUtilsTest.java
@@ -65,6 +65,7 @@
import android.content.Context;
import android.content.Intent;
+import androidx.test.filters.SdkSuppress;
import androidx.test.runner.AndroidJUnit4;
import com.android.cts.install.lib.TestApp;
@@ -273,6 +274,7 @@
}
@Test
+ @SdkSuppress(minSdkVersion = 31, codeName = "S")
public void testManageMediaPermissionsOnTestApp() throws Exception {
final String packageName = TEST_APP_WITH_STORAGE_PERMS.getPackageName();
final int testAppUid = getContext().getPackageManager().getPackageUid(packageName, 0);
diff --git a/tests/test_app/LegacyTestApp.xml b/tests/test_app/LegacyTestApp.xml
index f73143b..4fe9761 100644
--- a/tests/test_app/LegacyTestApp.xml
+++ b/tests/test_app/LegacyTestApp.xml
@@ -20,6 +20,8 @@
android:versionCode="1"
android:versionName="1.0">
+ <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="28" />
+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application android:label="LegacyTestApp"
diff --git a/tests/test_app/TestAppWithStoragePerms.xml b/tests/test_app/TestAppWithStoragePerms.xml
index c37b025..5910280 100644
--- a/tests/test_app/TestAppWithStoragePerms.xml
+++ b/tests/test_app/TestAppWithStoragePerms.xml
@@ -20,6 +20,8 @@
android:versionCode="1"
android:versionName="1.0">
+ <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30" />
+
<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION"/>
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.MANAGE_MEDIA"/>
diff --git a/tests/test_app/TestAppWithoutPerms.xml b/tests/test_app/TestAppWithoutPerms.xml
index 875d2c0..9708129 100644
--- a/tests/test_app/TestAppWithoutPerms.xml
+++ b/tests/test_app/TestAppWithoutPerms.xml
@@ -20,6 +20,8 @@
android:versionCode="1"
android:versionName="1.0">
+ <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30" />
+
<application android:label="TestAppWithoutPerms">
<activity android:name="com.android.providers.media.util.TestAppActivity"
android:exported="true">