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

Commit d0d1e68d authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Update PMService tests to use SDK version 10000" into udc-dev am: 08e6da33 

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



Change-Id: I771d2ed53f66766e20f200cec58ff4ff3e521c36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d153aa43 08e6da33

services/tests/PackageManagerServiceTests/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_r1000",

    name: "FrameworksServicesTests_install_uses_sdk_r10000",

    defaults: ["FrameworksServicesTests_apks_defaults"],

    manifest: "AndroidManifest-r1000.xml",

    manifest: "AndroidManifest-r10000.xml",

}



android_test_helper_app {
@@ -44,9 +44,9 @@ android_test_helper_app { 
}



android_test_helper_app {

    name: "FrameworksServicesTests_install_uses_sdk_r0_s1000",

    name: "FrameworksServicesTests_install_uses_sdk_r0_s10000",

    defaults: ["FrameworksServicesTests_apks_defaults"],

    manifest: "AndroidManifest-r0-s1000.xml",

    manifest: "AndroidManifest-r0-s10000.xml",

}



android_test_helper_app {

services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml→services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s10000.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="1000" />

        <extension-sdk android:sdkVersion="31" android:minExtensionVersion="10000" />

    </uses-sdk>



    <application>

services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml→services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r10000.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="1000" />

        <extension-sdk android:sdkVersion="30" android:minExtensionVersion="10000" />

    </uses-sdk>



    <application>

services/tests/PackageManagerServiceTests/server/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ java_genrule { 
        ":FrameworksServicesTests_install_uses_sdk_q0",

        ":FrameworksServicesTests_install_uses_sdk_q0_r0",

        ":FrameworksServicesTests_install_uses_sdk_r0",

        ":FrameworksServicesTests_install_uses_sdk_r1000",

        ":FrameworksServicesTests_install_uses_sdk_r10000",

        ":FrameworksServicesTests_install_uses_sdk_r_none",

        ":FrameworksServicesTests_install_uses_sdk_r0_s0",

        ":FrameworksServicesTests_install_uses_sdk_r0_s1000",

        ":FrameworksServicesTests_install_uses_sdk_r0_s10000",

        ":FrameworksServicesTests_keyset_permdef_sa_unone",

        ":FrameworksServicesTests_keyset_permuse_sa_ua_ub",

        ":FrameworksServicesTests_keyset_permuse_sb_ua_ub",

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

+2 −2
Original line number Diff line number Diff line
@@ -575,10 +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_r1000", R.raw.install_uses_sdk_r1000),

        appToError.put(Pair.create("install_uses_sdk.apk_r10000", R.raw.install_uses_sdk_r10000),

                       PackageManager.INSTALL_FAILED_OLDER_SDK);

        appToError.put(

                Pair.create("install_uses_sdk.apk_r0_s1000", R.raw.install_uses_sdk_r0_s1000),

                Pair.create("install_uses_sdk.apk_r0_s10000", R.raw.install_uses_sdk_r0_s10000),

                PackageManager.INSTALL_FAILED_OLDER_SDK);



        appToError.put(Pair.create("install_uses_sdk.apk_q0", R.raw.install_uses_sdk_q0),