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

Commit 90c355f5 authored by Winson Chiu's avatar Winson Chiu Committed by Android (Google) Code Review
Browse files

Merge "Add explicit versionCode to DexMetadataHelperTest APKs" into sc-dev

parents 6523da35 3c353283

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