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

Commit 4da4060a authored by Gurpreet Singh's avatar Gurpreet Singh Committed by Android (Google) Code Review
Browse files

Merge "Fix testUsesSdk test to use higher extension version."

parents 18d04605 4dd1cbed

services/tests/servicestests/Android.bp

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

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

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

services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml→services/tests/servicestests/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/servicestests/apks/install_uses_sdk/AndroidManifest-r5.xml→services/tests/servicestests/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/servicestests/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java

+5 −4
Original line number Diff line number Diff line
@@ -575,9 +575,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),
@@ -595,7 +596,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);

            }