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

Fix testUsesSdk test to use higher extension version.

Browse Source 
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.

Bug: 257466496
Test: atest FrameworksServicesTests:com.android.server.pm.parsing.PackageParserLegacyCoreTest#testUsesSdk

Change-Id: I5fb3ceed2b6db3dd5a5154df941918b97cb52204
(cherry picked from commit 4dd1cbed4b)
Merged-In: I5fb3ceed2b6db3dd5a5154df941918b97cb52204
This commit is contained in:
Gurpreet Singh
2022-11-09 15:15:56 +00:00
parent 82f4a78590
commit 587492489c
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/tests/servicestests/Android.bp
View File

@@ -194,10 +194,10 @@ 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",
":FrameworksServicesTests_keyset_permuse_sb_ua_ub",

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

@@ -32,9 +32,9 @@ android_test_helper_app {
}
android_test_helper_app {
name: "FrameworksServicesTests_install_uses_sdk_r5",
name: "FrameworksServicesTests_install_uses_sdk_r1000",
defaults: ["FrameworksServicesTests_apks_defaults"],
manifest: "AndroidManifest-r5.xml",
manifest: "AndroidManifest-r1000.xml",
}
android_test_helper_app {
@@ -44,9 +44,9 @@ android_test_helper_app {
}
android_test_helper_app {
name: "FrameworksServicesTests_install_uses_sdk_r0_s5",
name: "FrameworksServicesTests_install_uses_sdk_r0_s1000",
defaults: ["FrameworksServicesTests_apks_defaults"],
manifest: "AndroidManifest-r0-s5.xml",
manifest: "AndroidManifest-r0-s1000.xml",
}
android_test_helper_app {

2
services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml → services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml
View File

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

2
services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r5.xml → services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r1000.xml
View File

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

9
services/tests/servicestests/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java
View File

@@ -630,10 +630,11 @@ public class PackageParserLegacyCoreTest {
assertEquals(0, minExtVers.get(31, -1));
Map<Pair<String, Integer>, 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);
}