Internal change

PiperOrigin-RevId: 875013211

Author: DeviceInfra

src/java/com/google/devtools/mobileharness/api/devicemanager/detector/model/DetectionResult.java

@@ -73,5 +73,6 @@ public enum DetectionType {
     TTB,
     VIDEO,
     WINDOWS,
+    ZEBU,
   }
 }

src/java/com/google/devtools/mobileharness/api/devicemanager/dispatcher/util/DeviceIdGenerator.java

@@ -133,12 +133,15 @@ public DeviceId getUsbDeviceId(String deviceControlId) {
   public DeviceId getSshDeviceId(String deviceControlId) {
     try {
       return DeviceId.of(
-          deviceControlId, String.format("%s:%s", getLocalHostName(), deviceControlId), false);
+          deviceControlId,
+          String.format("%s:%s", getLocalHostName(), deviceControlId),
+          /* isUuidVolatile= */ false);
     } catch (MobileHarnessException e) {
       // Should not happen.
       logger.atWarning().withCause(e).log(
           "Failed to generate sshable EmbeddedLinuxDevice uuid, use random uuid instead.");
-      return DeviceId.of(deviceControlId, UUID.randomUUID().toString(), false);
+      return DeviceId.of(
+          deviceControlId, UUID.randomUUID().toString(), /* isUuidVolatile= */ false);
     }
   }
 
@@ -154,7 +157,7 @@ public DeviceId getVideoDeviceId(String deviceControlId) {
       return DeviceId.of(
           deviceControlId,
           String.format("%s:%s", getLocalHostName(), deviceControlId).replace('/', '-'),
-          false);
+          /* isUuidVolatile= */ false);
     } catch (MobileHarnessException e) {
       throw new AssertionError("Failed to generate VideoDevice uuid.", e);
     }
@@ -168,12 +171,13 @@ public DeviceId getVideoDeviceId(String deviceControlId) {
    */
   public DeviceId getLinuxDeviceId(String deviceControlId) {
     try {
-      return DeviceId.of(deviceControlId, getLocalHostName(), false);
+      return DeviceId.of(deviceControlId, getLocalHostName(), /* isUuidVolatile= */ false);
     } catch (MobileHarnessException e) {
       // Should not happen.
       logger.atWarning().withCause(e).log(
           "Failed to generate LinuxDevice uuid, use random uuid instead.");
-      return DeviceId.of(deviceControlId, UUID.randomUUID().toString(), false);
+      return DeviceId.of(
+          deviceControlId, UUID.randomUUID().toString(), /* isUuidVolatile= */ false);
     }
   }
 
@@ -191,25 +195,44 @@ public DeviceId getNoOpDeviceId(String deviceControlId) {
       // Should not happen.
       logger.atWarning().withCause(e).log(
           "Failed to generate NoOpDevice uuid, use random uuid instead..");
-      return DeviceId.of(deviceControlId, UUID.randomUUID().toString(), true);
+      return DeviceId.of(deviceControlId, UUID.randomUUID().toString(), /* isUuidVolatile= */ true);
     }
   }
 
   /**
-   * Generates the gem5 device id from device control id, adds the lab host name as the prefix of
+   * Generates the Gem5 device id from device control id, adds the lab host name as the prefix of
    * the uuid.
    *
    * @param deviceControlId the device control id from detector.
    */
   public DeviceId getGem5DeviceId(String deviceControlId) {
     try {
       return DeviceId.of(
-          deviceControlId, String.format("%s:%s", getLocalHostName(), deviceControlId), false);
+          deviceControlId,
+          String.format("%s:%s", getLocalHostName(), deviceControlId),
+          /* isUuidVolatile= */ false);
     } catch (MobileHarnessException e) {
       throw new AssertionError("Failed to generate Gem5Device uuid.", e);
     }
   }
 
+  /**
+   * Generates the ZeBu device id from device control id, adds the lab host name as the prefix of
+   * the uuid.
+   *
+   * @param deviceControlId the device control id from detector.
+   */
+  public DeviceId getZebuDeviceId(String deviceControlId) {
+    try {
+      return DeviceId.of(
+          deviceControlId,
+          String.format("%s:%s", getLocalHostName(), deviceControlId),
+          /* isUuidVolatile= */ false);
+    } catch (MobileHarnessException e) {
+      throw new AssertionError("Failed to generate ZebuDevice uuid.", e);
+    }
+  }
+
   private String getLocalHostName() throws MobileHarnessException {
     try {
       return netUtil.getLocalHostName();

src/java/com/google/devtools/mobileharness/infra/controller/device/bootstrap/BUILD

@@ -39,7 +39,7 @@ java_library(
         "//src/java/com/google/devtools/mobileharness/api/devicemanager/dispatcher:android_local_emulator",
         "//src/java/com/google/devtools/mobileharness/api/devicemanager/dispatcher:android_real_device",
         "//src/java/com/google/devtools/mobileharness/api/devicemanager/dispatcher:base",
-        "//src/java/com/google/devtools/mobileharness/api/devicemanager/dispatcher:failed_device",  # unuseddeps: keep
+        "//src/java/com/google/devtools/mobileharness/api/devicemanager/dispatcher:failed_device",  # buildcleaner: keep unuseddeps: keep
         "//src/java/com/google/devtools/mobileharness/api/devicemanager/dispatcher:no_op_device",
         "//src/java/com/google/devtools/mobileharness/api/devicemanager/util:class_util",
         "//src/java/com/google/devtools/mobileharness/api/model/error",