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

Commit 3c353283 authored by Winson's avatar Winson
Browse files

Add explicit versionCode to DexMetadataHelperTest APKs 

These tests were verifying against an implicit versionCode 30 which was
added by the build system implicitly, using the old platform SDK. Since
one was not specified by the test apps.

When the SDK moved to 31, this changed what versionCode the APKs used,
and thus broke the tests. This uses 9001, which should be hard to
confuse with a near future platform SDK version.

Bug: 189990253

Test: atest DexMetadataHelperTest

Change-Id: Iaf39b1a7414e56e69a6eec57a339105e9e2ffbcc
parent 1746c1e3

services/tests/servicestests/apks/install-split-base/AndroidManifest.xml

+5 −2
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.frameworks.servicestests.install_split"

     android:isolatedSplits="true">

    android:isolatedSplits="true"

    android:versionCode="9001"

    android:versionName="1.0"

    >



    <application android:label="ClassloaderSplitApp">

        <activity android:name=".BaseActivity"

services/tests/servicestests/apks/install-split-feature-a/AndroidManifest.xml

+5 −2
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.frameworks.servicestests.install_split"

     featureSplit="feature_a">

    featureSplit="feature_a"

    android:versionCode="9001"

    android:versionName="1.0"

    >



    <application>

        <activity android:name=".feature_a.FeatureAActivity"

services/tests/servicestests/src/com/android/server/pm/dex/DexMetadataHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public class DexMetadataHelperTest { 
    private static final String DEX_METADATA_FILE_EXTENSION = ".dm";

    private static final String DEX_METADATA_PACKAGE_NAME =

            "com.android.frameworks.servicestests.install_split";

    private static long DEX_METADATA_VERSION_CODE = 30;

    private static final long DEX_METADATA_VERSION_CODE = 9001;



    @Rule

    public TemporaryFolder mTemporaryFolder = new TemporaryFolder();