Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update PMService tests to use SDK version 10000

Browse Source 
A recent update to the lint checks now enforces SDK versions be
specified as a supported value (currently released SDK versions
or 10000 for a development release). The PackageManagerService
tests use a minExtensionVersion set to 1000 which causes the
lint check to fail due to 1000 not being a supported SDK version.
This commit updates these values to 10000 to be a supported SDK
version recognized by the lint checks.

Bug: 273389716
Test: atest PackageParserLegacyCoreTest
Change-Id: I05081ef96c44dbf0cbedf585a2e13897712d080c
This commit is contained in:
Michael Groover
2023-03-13 23:01:17 -05:00
parent 51aa1772cb
commit 714d1f1b34
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp
View File

@@ -32,9 +32,9 @@ android_test_helper_app {
} }
android_test_helper_app { android_test_helper_app {
name: "FrameworksServicesTests_install_uses_sdk_r1000", name: "FrameworksServicesTests_install_uses_sdk_r10000",
defaults: ["FrameworksServicesTests_apks_defaults"], defaults: ["FrameworksServicesTests_apks_defaults"],
manifest: "AndroidManifest-r1000.xml", manifest: "AndroidManifest-r10000.xml",
} }
android_test_helper_app { android_test_helper_app {
@@ -44,9 +44,9 @@ android_test_helper_app {
} }
android_test_helper_app { android_test_helper_app {
name: "FrameworksServicesTests_install_uses_sdk_r0_s1000", name: "FrameworksServicesTests_install_uses_sdk_r0_s10000",
defaults: ["FrameworksServicesTests_apks_defaults"], defaults: ["FrameworksServicesTests_apks_defaults"],
manifest: "AndroidManifest-r0-s1000.xml", manifest: "AndroidManifest-r0-s10000.xml",
} }
android_test_helper_app { android_test_helper_app {

2
services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml → services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s10000.xml
View File

@@ -19,7 +19,7 @@
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29"> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29">
<!-- This fails because 31 is not version 5 --> <!-- This fails because 31 is not version 5 -->
<extension-sdk android:sdkVersion="30" android:minExtensionVersion="0" /> <extension-sdk android:sdkVersion="30" android:minExtensionVersion="0" />
<extension-sdk android:sdkVersion="31" android:minExtensionVersion="1000" /> <extension-sdk android:sdkVersion="31" android:minExtensionVersion="10000" />
</uses-sdk> </uses-sdk>
<application> <application>

2
services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml → services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r10000.xml
View File

@@ -18,7 +18,7 @@
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29"> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29">
<!-- This will fail to install, because minExtensionVersion is not met --> <!-- This will fail to install, because minExtensionVersion is not met -->
<extension-sdk android:sdkVersion="30" android:minExtensionVersion="1000" /> <extension-sdk android:sdkVersion="30" android:minExtensionVersion="10000" />
</uses-sdk> </uses-sdk>
<application> <application>

4
services/tests/PackageManagerServiceTests/server/Android.bp
View File

@@ -127,10 +127,10 @@ java_genrule {
":FrameworksServicesTests_install_uses_sdk_q0", ":FrameworksServicesTests_install_uses_sdk_q0",
":FrameworksServicesTests_install_uses_sdk_q0_r0", ":FrameworksServicesTests_install_uses_sdk_q0_r0",
":FrameworksServicesTests_install_uses_sdk_r0", ":FrameworksServicesTests_install_uses_sdk_r0",
":FrameworksServicesTests_install_uses_sdk_r1000", ":FrameworksServicesTests_install_uses_sdk_r10000",
":FrameworksServicesTests_install_uses_sdk_r_none", ":FrameworksServicesTests_install_uses_sdk_r_none",
":FrameworksServicesTests_install_uses_sdk_r0_s0", ":FrameworksServicesTests_install_uses_sdk_r0_s0",
":FrameworksServicesTests_install_uses_sdk_r0_s1000", ":FrameworksServicesTests_install_uses_sdk_r0_s10000",
":FrameworksServicesTests_keyset_permdef_sa_unone", ":FrameworksServicesTests_keyset_permdef_sa_unone",
":FrameworksServicesTests_keyset_permuse_sa_ua_ub", ":FrameworksServicesTests_keyset_permuse_sa_ua_ub",
":FrameworksServicesTests_keyset_permuse_sb_ua_ub", ":FrameworksServicesTests_keyset_permuse_sb_ua_ub",

4
services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java
View File

@@ -575,10 +575,10 @@ public class PackageParserLegacyCoreTest {
assertEquals(0, minExtVers.get(31, -1)); assertEquals(0, minExtVers.get(31, -1));
Map<Pair<String, Integer>, Integer> appToError = new HashMap<>(); Map<Pair<String, Integer>, Integer> appToError = new HashMap<>();
appToError.put(Pair.create("install_uses_sdk.apk_r1000", R.raw.install_uses_sdk_r1000), appToError.put(Pair.create("install_uses_sdk.apk_r10000", R.raw.install_uses_sdk_r10000),
PackageManager.INSTALL_FAILED_OLDER_SDK); PackageManager.INSTALL_FAILED_OLDER_SDK);
appToError.put( appToError.put(
Pair.create("install_uses_sdk.apk_r0_s1000", R.raw.install_uses_sdk_r0_s1000), Pair.create("install_uses_sdk.apk_r0_s10000", R.raw.install_uses_sdk_r0_s10000),
PackageManager.INSTALL_FAILED_OLDER_SDK); PackageManager.INSTALL_FAILED_OLDER_SDK);
appToError.put(Pair.create("install_uses_sdk.apk_q0", R.raw.install_uses_sdk_q0), appToError.put(Pair.create("install_uses_sdk.apk_q0", R.raw.install_uses_sdk_q0),