From b9b950035f2e634954940a2daa1308780ac47f3b Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Wed, 9 Nov 2022 15:15:56 +0000 Subject: [PATCH] Fix testUsesSdk test to use higher extension version. The installation of sdk extension version that does not exist should fail. Since extension 5 exist now, the test started failing. This CL changes the non-existent extension version to a higher value to ensure it does not exist, to ensure installation failure in the test. (cherry-picked from 4dd1cbed4b098237ea4d16a3ee8c0d8a7f920179) Bug: 257466496 Test: atest FrameworksServicesTests:com.android.server.pm.parsing.PackageParserLegacyCoreTest#testUsesSdk Change-Id: I5fb3ceed2b6db3dd5a5154df941918b97cb52204 Merged-In: I5fb3ceed2b6db3dd5a5154df941918b97cb52204 --- .../apks/install_uses_sdk/Android.bp | 12 ------------ .../install_uses_sdk/AndroidManifest-r0-s1000.xml | 2 +- .../apks/install_uses_sdk/AndroidManifest-r1000.xml | 2 +- .../PackageManagerServiceTests/server/Android.bp | 2 -- .../server/parsing/PackageParserLegacyCoreTest.java | 9 +++++---- 5 files changed, 7 insertions(+), 20 deletions(-) diff --git a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp index 9f96256078f3f..2894395611783 100644 --- a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp +++ b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp @@ -31,12 +31,6 @@ android_test_helper_app { manifest: "AndroidManifest-r0.xml", } -android_test_helper_app { - name: "FrameworksServicesTests_install_uses_sdk_r5", - defaults: ["FrameworksServicesTests_apks_defaults"], - manifest: "AndroidManifest-r5.xml", -} - android_test_helper_app { name: "FrameworksServicesTests_install_uses_sdk_r1000", defaults: ["FrameworksServicesTests_apks_defaults"], @@ -55,12 +49,6 @@ android_test_helper_app { manifest: "AndroidManifest-r0-s1000.xml", } -android_test_helper_app { - name: "FrameworksServicesTests_install_uses_sdk_r0_s5", - defaults: ["FrameworksServicesTests_apks_defaults"], - manifest: "AndroidManifest-r0-s5.xml", -} - android_test_helper_app { name: "FrameworksServicesTests_install_uses_sdk_0", defaults: ["FrameworksServicesTests_apks_defaults"], diff --git a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml index bafe4c4faa3f6..25743b87cabd1 100644 --- a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml +++ b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.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-r1000.xml index 7723d051a0418..9bf925417e492 100644 --- a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml +++ b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml @@ -18,7 +18,7 @@ - + diff --git a/services/tests/PackageManagerServiceTests/server/Android.bp b/services/tests/PackageManagerServiceTests/server/Android.bp index f1edd96d1adcb..0b543f32080c0 100644 --- a/services/tests/PackageManagerServiceTests/server/Android.bp +++ b/services/tests/PackageManagerServiceTests/server/Android.bp @@ -127,11 +127,9 @@ java_genrule { ":FrameworksServicesTests_install_uses_sdk_q0", ":FrameworksServicesTests_install_uses_sdk_q0_r0", ":FrameworksServicesTests_install_uses_sdk_r0", - ":FrameworksServicesTests_install_uses_sdk_r5", ":FrameworksServicesTests_install_uses_sdk_r1000", ":FrameworksServicesTests_install_uses_sdk_r_none", ":FrameworksServicesTests_install_uses_sdk_r0_s0", - ":FrameworksServicesTests_install_uses_sdk_r0_s5", ":FrameworksServicesTests_install_uses_sdk_r0_s1000", ":FrameworksServicesTests_keyset_permdef_sa_unone", ":FrameworksServicesTests_keyset_permuse_sa_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 c6a634056087d..8b0e71deac86b 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,11 @@ public class PackageParserLegacyCoreTest { assertEquals(0, minExtVers.get(31, -1)); Map, Integer> appToError = new HashMap<>(); - appToError.put(Pair.create("install_uses_sdk.apk_r5", R.raw.install_uses_sdk_r5), - PackageManager.INSTALL_FAILED_OLDER_SDK); - appToError.put(Pair.create("install_uses_sdk.apk_r0_s5", R.raw.install_uses_sdk_r0_s5), + appToError.put(Pair.create("install_uses_sdk.apk_r1000", R.raw.install_uses_sdk_r1000), PackageManager.INSTALL_FAILED_OLDER_SDK); + appToError.put( + Pair.create("install_uses_sdk.apk_r0_s1000", R.raw.install_uses_sdk_r0_s1000), + PackageManager.INSTALL_FAILED_OLDER_SDK); appToError.put(Pair.create("install_uses_sdk.apk_q0", R.raw.install_uses_sdk_q0), PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED); @@ -650,7 +651,7 @@ public class PackageParserLegacyCoreTest { int result = entry.getValue(); try { parsePackage(filename, resId, x -> x); - expect.withMessage("Expected parsing error %d from %s", result, filename).fail(); + expect.withMessage("Expected parsing error %s from %s", result, filename).fail(); } catch (PackageManagerException expected) { expect.that(expected.error).isEqualTo(result); }