Upgrading the targeted_sdk_version for cts app.
Test: test .
Build: 229197836
Change-Id: I50095be34427b6472029e386d89dea20686c7534
diff --git a/tests/tests/provider/Android.bp b/tests/tests/provider/Android.bp
index 5a1b7a0..33e0f1c 100644
--- a/tests/tests/provider/Android.bp
+++ b/tests/tests/provider/Android.bp
@@ -1,4 +1,3 @@
-
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
@@ -42,24 +41,22 @@
srcs: [
"src/**/*.java",
"app/GalleryTestApp/src/**/*.java",
- "app/MultiAuthorityApp/src/**/*.java"],
+ "app/MultiAuthorityApp/src/**/*.java",
+ ],
- // uncomment when b/140885436 is fixed
- // sdk_version: "test_current",
min_sdk_version: "21",
- //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
- target_sdk_version: "10000",
-
- platform_apis: true,
+ target_sdk_version: "test_current",
data: [
":CtsProviderGalleryTestApp",
- ":CtsProviderMultiAuthorityApp"
+ ":CtsProviderMultiAuthorityApp",
],
}
filegroup {
name: "CtsProviderTestUtils",
- srcs: ["src/android/provider/cts/ProviderTestUtils.java",
- "src/android/provider/cts/media/MediaStoreUtils.java"],
+ srcs: [
+ "src/android/provider/cts/ProviderTestUtils.java",
+ "src/android/provider/cts/media/MediaStoreUtils.java",
+ ],
}
diff --git a/tests/tests/provider/AndroidManifest.xml b/tests/tests/provider/AndroidManifest.xml
index 93ba41d..908aada 100644
--- a/tests/tests/provider/AndroidManifest.xml
+++ b/tests/tests/provider/AndroidManifest.xml
@@ -19,8 +19,6 @@
xmlns:tools="http://schemas.android.com/tools"
package="android.provider.cts">
- <uses-sdk android:targetSdkVersion="28"/>
-
<!-- This is required for android.provider.cts.media.MediaStore_MetadataKeysTest
when upgrading targetSdkVersion to R+
<queries>
diff --git a/tests/tests/provider/src/android/provider/cts/settings/SettingsTest.java b/tests/tests/provider/src/android/provider/cts/settings/SettingsTest.java
index aad6d79..f8e74ab 100644
--- a/tests/tests/provider/src/android/provider/cts/settings/SettingsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/settings/SettingsTest.java
@@ -51,7 +51,6 @@
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -375,7 +374,6 @@
}
- @Ignore("b/229197836")
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)
public void testDataRoamingAccessPermission() throws Exception {
diff --git a/tests/tests/provider/src/android/provider/cts/settings/Settings_SecureTest.java b/tests/tests/provider/src/android/provider/cts/settings/Settings_SecureTest.java
index 693284f..e5b23aa 100644
--- a/tests/tests/provider/src/android/provider/cts/settings/Settings_SecureTest.java
+++ b/tests/tests/provider/src/android/provider/cts/settings/Settings_SecureTest.java
@@ -24,11 +24,13 @@
import android.content.ContentResolver;
import android.database.Cursor;
import android.net.Uri;
+import android.os.Build;
import android.provider.Settings;
import android.provider.Settings.Secure;
import android.provider.Settings.SettingNotFoundException;
import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
@@ -203,6 +205,7 @@
* available to non-privileged apps, such as the CTS test app in the context of which this test
* runs.
*/
+ @SdkSuppress(maxSdkVersion = Build.VERSION_CODES.S)
@Test
public void testBluetoothAddressNotAvailable() {
assertNull(Settings.Secure.getString(cr, BLUETOOTH_MAC_ADDRESS_SETTING_NAME));
