Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1e1aeca authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Fix testUsesSdk test to use higher extension version. 2p: b9b95003 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22928624

Bug: 257466496
Change-Id: I48b7460798d9ab67d493dcfb03fdb35388d1488c
Merged-In: I5fb3ceed2b6db3dd5a5154df941918b97cb52204
parents 531490b7 b9b95003

services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp

+0 −12
Original line number Diff line number Diff line
@@ -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"],

services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

services/tests/PackageManagerServiceTests/server/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -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",

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

+5 −4
Original line number Diff line number Diff line
@@ -630,9 +630,10 @@ 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),

        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_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);



        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();

            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);

            }