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

Merge "Fix testUsesSdk test to use higher extension version." into tm-qpr-dev

Browse Source
This commit is contained in:
Paul Duffin
2023-05-03 11:17:32 +00:00
committed by Android (Google) Code Review
parent 89a5d8301b b9b950035f
commit 06367a1f18
5 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,12 +31,6 @@ android_test_helper_app {
manifest: "AndroidManifest-r0.xml", 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 { android_test_helper_app {
name: "FrameworksServicesTests_install_uses_sdk_r1000", name: "FrameworksServicesTests_install_uses_sdk_r1000",
defaults: ["FrameworksServicesTests_apks_defaults"], defaults: ["FrameworksServicesTests_apks_defaults"],
@@ -55,12 +49,6 @@ android_test_helper_app {
manifest: "AndroidManifest-r0-s1000.xml", 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 { android_test_helper_app {
name: "FrameworksServicesTests_install_uses_sdk_0", name: "FrameworksServicesTests_install_uses_sdk_0",
defaults: ["FrameworksServicesTests_apks_defaults"], defaults: ["FrameworksServicesTests_apks_defaults"],

2
services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.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="5" /> <extension-sdk android:sdkVersion="31" android:minExtensionVersion="1000" />
</uses-sdk> </uses-sdk>
<application> <application>

2
services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.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="5" /> <extension-sdk android:sdkVersion="30" android:minExtensionVersion="1000" />
</uses-sdk> </uses-sdk>
<application> <application>

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

@@ -127,11 +127,9 @@ 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_r5",
":FrameworksServicesTests_install_uses_sdk_r1000", ":FrameworksServicesTests_install_uses_sdk_r1000",
":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_s5",
":FrameworksServicesTests_install_uses_sdk_r0_s1000", ":FrameworksServicesTests_install_uses_sdk_r0_s1000",
":FrameworksServicesTests_keyset_permdef_sa_unone", ":FrameworksServicesTests_keyset_permdef_sa_unone",
":FrameworksServicesTests_keyset_permuse_sa_ua_ub", ":FrameworksServicesTests_keyset_permuse_sa_ua_ub",

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

@@ -630,9 +630,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_r5", R.raw.install_uses_sdk_r5), appToError.put(Pair.create("install_uses_sdk.apk_r1000", R.raw.install_uses_sdk_r1000),
PackageManager.INSTALL_FAILED_OLDER_SDK); 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_r0_s1000", R.raw.install_uses_sdk_r0_s1000),
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),
@@ -650,7 +651,7 @@ public class PackageParserLegacyCoreTest {
int result = entry.getValue(); int result = entry.getValue();
try { try {
parsePackage(filename, resId, x -> x); 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) { } catch (PackageManagerException expected) {
expect.that(expected.error).isEqualTo(result); expect.that(expected.error).isEqualTo(result);
} }