Skip to content

Internal change #3527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
May 6, 2025
Merged

Internal change #3527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...ols/mobileharness/infra/controller/test/util/xtsdownloader/MctsDynamicDownloadPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,11 @@ public class MctsDynamicDownloadPlugin implements XtsDynamicDownloadPlugin {

private static final String NON_PRELOADED_KEY = "non-preloaded";

// Only consider the Module released in Android V+ , the month digits (3,4 index) should not be 00
// or 99.
// Only consider the Module released in Android V+ and not beta version, 5th digit >= 4 indicates
// platform beta (or mainline beta if >=8 or daily if => 9), refer to b/413266608 for more
// details.
private static final Pattern VERSIONCODE_PATTERN =
Pattern.compile("(3[5-9]|[4-9][0-9])(?!(00|99))\\d{2}(?!99999)\\d{5}");
Pattern.compile("(3[5-9]|[4-9][0-9])(?!(00|99))\\d{2}[0-3]\\d{4}");

// Add the versioncode from
// android/platform/superproject/main/+/main:build/release/flag_declarations/RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION.textproto
Expand Down
6 changes: 3 additions & 3 deletions ...mobileharness/infra/controller/test/util/xtsdownloader/MctsDynamicDownloadPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,18 @@ public void setUp() throws MobileHarnessException, InterruptedException {
.thenReturn(XtsConstants.DYNAMIC_MCTS_JOB_NAME);
when(mockAndroidPackageManagerUtil.getAppVersionCode(
any(), eq("com.google.android.modulemetadata")))
.thenReturn(351050004);
.thenReturn(351030004);
when(mockAndroidPackageManagerUtil.getAppVersionCode(
any(), eq("com.google.android.captiveportallogin")))
.thenReturn(351050004);
.thenReturn(351030004);
when(mockAndroidPackageManagerUtil.getAppVersionCode(any(), eq("com.google.android.conscrypt")))
.thenReturn(350050004);
when(mockAndroidPackageManagerUtil.getAppVersionCode(
any(), eq("com.google.android.go.configinfrastructure")))
.thenReturn(341050004);
when(mockAndroidPackageManagerUtil.getAppVersionCode(
any(), eq("com.google.android.documentsui")))
.thenReturn(359999999);
.thenReturn(351059999);
when(mockAdbUtil.getProperty(any(), eq(AndroidProperty.ABI))).thenReturn("arm64-v8a");
when(mockAdbUtil.getProperty(any(), eq(AndroidProperty.SDK_VERSION))).thenReturn("30");
when(mockAdbUtil.getProperty(any(), eq(AndroidProperty.CODENAME))).thenReturn("fake_codename");
Expand Down