Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add explicit versionCode to DexMetadataHelperTest APKs" into sc-dev am: 90c355f5bf

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

Change-Id: Ifd782030c229cd4b617c2a4d5634a007a69357e4
This commit is contained in:
Winson Chiu
2021-06-07 18:16:45 +00:00
committed by Automerger Merge Worker
parent 829298b309 90c355f5bf
commit 5b6fc849e1
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,8 +15,11 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.frameworks.servicestests.install_split" package="com.android.frameworks.servicestests.install_split"
android:isolatedSplits="true"> android:isolatedSplits="true"
android:versionCode="9001"
android:versionName="1.0"
>
<application android:label="ClassloaderSplitApp"> <application android:label="ClassloaderSplitApp">
<activity android:name=".BaseActivity" <activity android:name=".BaseActivity"

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

@@ -15,8 +15,11 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.frameworks.servicestests.install_split" package="com.android.frameworks.servicestests.install_split"
featureSplit="feature_a"> featureSplit="feature_a"
android:versionCode="9001"
android:versionName="1.0"
>
<application> <application>
<activity android:name=".feature_a.FeatureAActivity" <activity android:name=".feature_a.FeatureAActivity"

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

@@ -69,7 +69,7 @@ public class DexMetadataHelperTest {
private static final String DEX_METADATA_FILE_EXTENSION = ".dm"; private static final String DEX_METADATA_FILE_EXTENSION = ".dm";
private static final String DEX_METADATA_PACKAGE_NAME = private static final String DEX_METADATA_PACKAGE_NAME =
"com.android.frameworks.servicestests.install_split"; "com.android.frameworks.servicestests.install_split";
private static long DEX_METADATA_VERSION_CODE = 30; private static final long DEX_METADATA_VERSION_CODE = 9001;
@Rule @Rule
public TemporaryFolder mTemporaryFolder = new TemporaryFolder(); public TemporaryFolder mTemporaryFolder = new TemporaryFolder();