From f5344f6c4eb41f28a5b1c5259d4a3dfc4d40afd1 Mon Sep 17 00:00:00 2001 From: Michael Groover Date: Mon, 13 Mar 2023 23:01:17 -0500 Subject: [PATCH] Update PMService tests to use SDK version 10000 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 Bug: 280595738 Test: atest PackageParserLegacyCoreTest Merged-In: I05081ef96c44dbf0cbedf585a2e13897712d080c Change-Id: I05081ef96c44dbf0cbedf585a2e13897712d080c (cherry picked from commit 714d1f1b34221d69676588983ebf58d56d5f8a59) --- .../apks/install_uses_sdk/Android.bp | 8 ++++---- ...anifest-r0-s1000.xml => AndroidManifest-r0-s10000.xml} | 2 +- ...droidManifest-r1000.xml => AndroidManifest-r10000.xml} | 2 +- .../tests/PackageManagerServiceTests/server/Android.bp | 4 ++-- .../server/parsing/PackageParserLegacyCoreTest.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename services/tests/PackageManagerServiceTests/apks/install_uses_sdk/{AndroidManifest-r0-s1000.xml => AndroidManifest-r0-s10000.xml} (98%) rename services/tests/PackageManagerServiceTests/apks/install_uses_sdk/{AndroidManifest-r1000.xml => AndroidManifest-r10000.xml} (98%) diff --git a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp index 2894395611783..24e380ccd82ed 100644 --- a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp +++ b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp @@ -32,9 +32,9 @@ android_test_helper_app { } android_test_helper_app { - name: "FrameworksServicesTests_install_uses_sdk_r1000", + name: "FrameworksServicesTests_install_uses_sdk_r10000", defaults: ["FrameworksServicesTests_apks_defaults"], - manifest: "AndroidManifest-r1000.xml", + manifest: "AndroidManifest-r10000.xml", } android_test_helper_app { @@ -44,9 +44,9 @@ 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"], - manifest: "AndroidManifest-r0-s1000.xml", + manifest: "AndroidManifest-r0-s10000.xml", } android_test_helper_app { diff --git a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s10000.xml similarity index 98% rename from services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s10000.xml index 25743b87cabd1..383e60ab3b41c 100644 --- a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml +++ b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s10000.xml @@ -19,7 +19,7 @@ - + diff --git a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r10000.xml similarity index 98% rename from services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r10000.xml index 9bf925417e492..fe7a212a1d034 100644 --- a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml +++ b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r10000.xml @@ -18,7 +18,7 @@ - + diff --git a/services/tests/PackageManagerServiceTests/server/Android.bp b/services/tests/PackageManagerServiceTests/server/Android.bp index 0b543f32080c0..7428ff4ab13a4 100644 --- a/services/tests/PackageManagerServiceTests/server/Android.bp +++ b/services/tests/PackageManagerServiceTests/server/Android.bp @@ -127,10 +127,10 @@ java_genrule { ":FrameworksServicesTests_install_uses_sdk_q0", ":FrameworksServicesTests_install_uses_sdk_q0_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_r0_s0", - ":FrameworksServicesTests_install_uses_sdk_r0_s1000", + ":FrameworksServicesTests_install_uses_sdk_r0_s10000", ":FrameworksServicesTests_keyset_permdef_sa_unone", ":FrameworksServicesTests_keyset_permuse_sa_ua_ub", ":FrameworksServicesTests_keyset_permuse_sb_ua_ub", diff --git a/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/PackageParserLegacyCoreTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/PackageParserLegacyCoreTest.java index 8b0e71deac86b..c7d464ef07055 100644 --- a/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/PackageParserLegacyCoreTest.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/PackageParserLegacyCoreTest.java @@ -630,10 +630,10 @@ public class PackageParserLegacyCoreTest { assertEquals(0, minExtVers.get(31, -1)); Map, 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); 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); appToError.put(Pair.create("install_uses_sdk.apk_q0", R.raw.install_uses_sdk_q0),