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

Add explicit versionCode to DexMetadataHelperTest APKs

Browse Source 
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
This commit is contained in:
Winson
2021-06-04 14:18:07 -07:00
parent 1746c1e330
commit 3c3532836b
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"
package="com.android.frameworks.servicestests.install_split"
android:isolatedSplits="true">
package="com.android.frameworks.servicestests.install_split"
android:isolatedSplits="true"
android:versionCode="9001"
android:versionName="1.0"
>
<application android:label="ClassloaderSplitApp">
<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"
package="com.android.frameworks.servicestests.install_split"
featureSplit="feature_a">
package="com.android.frameworks.servicestests.install_split"
featureSplit="feature_a"
android:versionCode="9001"
android:versionName="1.0"
>
<application>
<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_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();