Internal change

PiperOrigin-RevId: 750990358

Author: DeviceInfra

src/java/com/google/devtools/mobileharness/infra/controller/test/util/xtsdownloader/MctsDynamicDownloadPlugin.java

@@ -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

src/javatests/com/google/devtools/mobileharness/infra/controller/test/util/xtsdownloader/MctsDynamicDownloadPluginTest.java

@@ -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");