From da41f959e425e06f9ae59e5be5be4eb09d4894d4 Mon Sep 17 00:00:00 2001 From: DeviceInfra Date: Fri, 24 Jan 2025 00:33:56 -0800 Subject: [PATCH] Internal change PiperOrigin-RevId: 719186874 --- .../devtools/mobileharness/api/model/error/InfraErrorId.java | 1 + .../wireless/qa/mobileharness/shared/api/step/android/BUILD | 2 +- .../shared/api/step/android/InstallApkStepJobValidator.java | 2 +- .../job/AndroidDeviceSettingsDecoratorJobValidator.java | 2 +- .../validator/job/AndroidLogCatDecoratorJobValidator.java | 2 +- .../api/validator/job/AndroidNativeBinJobValidator.java | 2 +- .../wireless/qa/mobileharness/shared/api/validator/job/BUILD | 5 ++--- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/java/com/google/devtools/mobileharness/api/model/error/InfraErrorId.java b/src/java/com/google/devtools/mobileharness/api/model/error/InfraErrorId.java index 29d252444..31d8c1e63 100644 --- a/src/java/com/google/devtools/mobileharness/api/model/error/InfraErrorId.java +++ b/src/java/com/google/devtools/mobileharness/api/model/error/InfraErrorId.java @@ -579,6 +579,7 @@ public enum InfraErrorId implements ErrorId { // Moreto: 53_401 ~ 53_450 MORETO_TIMEOUT_ERROR(53_401, ErrorType.INFRA_ISSUE), MORETO_CREATE_JOB_INFO_ERROR(53_402, ErrorType.INFRA_ISSUE), + MORETO_SIGNAL_INVALID_REMOTE_SIGNAL(53_403, ErrorType.INFRA_ISSUE), // Nezha ERROR: 53_451 ~ 53_460 NEZHA_LEGACY_ERROR(53_501, ErrorType.UNDETERMINED), diff --git a/src/java/com/google/wireless/qa/mobileharness/shared/api/step/android/BUILD b/src/java/com/google/wireless/qa/mobileharness/shared/api/step/android/BUILD index 6fa2e664c..dc1c5b2cc 100644 --- a/src/java/com/google/wireless/qa/mobileharness/shared/api/step/android/BUILD +++ b/src/java/com/google/wireless/qa/mobileharness/shared/api/step/android/BUILD @@ -72,11 +72,11 @@ java_library( srcs = ["InstallApkStepJobValidator.java"], deps = [ ":install_apk_step_constants", + "//src/java/com/google/devtools/mobileharness/api/model/error", "//src/java/com/google/devtools/mobileharness/api/model/job/in", "//src/java/com/google/devtools/mobileharness/shared/util/file/local", "//src/java/com/google/devtools/mobileharness/shared/util/logging:google_logger", "//src/java/com/google/devtools/mobileharness/shared/util/path", - "//src/java/com/google/wireless/qa/mobileharness/shared:exception", "//src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job:job_validator", "//src/java/com/google/wireless/qa/mobileharness/shared/model/job", "@maven//:com_google_guava_guava", diff --git a/src/java/com/google/wireless/qa/mobileharness/shared/api/step/android/InstallApkStepJobValidator.java b/src/java/com/google/wireless/qa/mobileharness/shared/api/step/android/InstallApkStepJobValidator.java index a3fa513dd..d35ba90ef 100644 --- a/src/java/com/google/wireless/qa/mobileharness/shared/api/step/android/InstallApkStepJobValidator.java +++ b/src/java/com/google/wireless/qa/mobileharness/shared/api/step/android/InstallApkStepJobValidator.java @@ -19,10 +19,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; +import com.google.devtools.mobileharness.api.model.error.MobileHarnessException; import com.google.devtools.mobileharness.api.model.job.in.Files.FileInfo; import com.google.devtools.mobileharness.shared.util.file.local.LocalFileUtil; import com.google.devtools.mobileharness.shared.util.path.PathUtil; -import com.google.wireless.qa.mobileharness.shared.MobileHarnessException; import com.google.wireless.qa.mobileharness.shared.api.validator.job.JobValidator; import com.google.wireless.qa.mobileharness.shared.model.job.JobInfo; import java.util.ArrayList; diff --git a/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidDeviceSettingsDecoratorJobValidator.java b/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidDeviceSettingsDecoratorJobValidator.java index c9ca44e14..9ec84d1f5 100644 --- a/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidDeviceSettingsDecoratorJobValidator.java +++ b/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidDeviceSettingsDecoratorJobValidator.java @@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; import com.google.devtools.mobileharness.api.model.error.AndroidErrorId; -import com.google.wireless.qa.mobileharness.shared.MobileHarnessException; +import com.google.devtools.mobileharness.api.model.error.MobileHarnessException; import com.google.wireless.qa.mobileharness.shared.model.job.JobInfo; import com.google.wireless.qa.mobileharness.shared.model.job.in.spec.SpecConfigable; import com.google.wireless.qa.mobileharness.shared.proto.spec.decorator.AndroidDeviceSettingsDecoratorSpec; diff --git a/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidLogCatDecoratorJobValidator.java b/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidLogCatDecoratorJobValidator.java index 423fdbb73..5851a8dd6 100644 --- a/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidLogCatDecoratorJobValidator.java +++ b/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidLogCatDecoratorJobValidator.java @@ -17,7 +17,7 @@ package com.google.wireless.qa.mobileharness.shared.api.validator.job; import com.google.common.collect.ImmutableSet; -import com.google.wireless.qa.mobileharness.shared.MobileHarnessException; +import com.google.devtools.mobileharness.api.model.error.MobileHarnessException; import com.google.wireless.qa.mobileharness.shared.api.spec.AndroidLogCatSpec; import com.google.wireless.qa.mobileharness.shared.api.validator.util.AndroidDecoratorValidatorUtil; import com.google.wireless.qa.mobileharness.shared.model.job.JobInfo; diff --git a/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidNativeBinJobValidator.java b/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidNativeBinJobValidator.java index c1ede744b..c670f6e3f 100644 --- a/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidNativeBinJobValidator.java +++ b/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/AndroidNativeBinJobValidator.java @@ -16,7 +16,7 @@ package com.google.wireless.qa.mobileharness.shared.api.validator.job; -import com.google.wireless.qa.mobileharness.shared.MobileHarnessException; +import com.google.devtools.mobileharness.api.model.error.MobileHarnessException; import com.google.wireless.qa.mobileharness.shared.api.spec.AndroidNativeBinSpec; import com.google.wireless.qa.mobileharness.shared.model.job.JobInfo; import java.time.Duration; diff --git a/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/BUILD b/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/BUILD index 4328648c4..0ad381562 100644 --- a/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/BUILD +++ b/src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job/BUILD @@ -84,7 +84,6 @@ java_library( ":job_validator", "//src/java/com/google/devtools/mobileharness/api/model/error", "//src/java/com/google/devtools/mobileharness/shared/util/logging:google_logger", - "//src/java/com/google/wireless/qa/mobileharness/shared:exception", "//src/java/com/google/wireless/qa/mobileharness/shared/model/job", "//src/java/com/google/wireless/qa/mobileharness/shared/model/job/in/spec", "//src/java/com/google/wireless/qa/mobileharness/shared/proto/spec:android_device_setting_decorator_spec_java_proto", @@ -125,7 +124,7 @@ java_library( srcs = ["AndroidLogCatDecoratorJobValidator.java"], deps = [ ":job_validator", - "//src/java/com/google/wireless/qa/mobileharness/shared:exception", + "//src/java/com/google/devtools/mobileharness/api/model/error", "//src/java/com/google/wireless/qa/mobileharness/shared/api/spec:android_logcat_spec", "//src/java/com/google/wireless/qa/mobileharness/shared/api/validator/util:android_decorator_validator_util", "//src/java/com/google/wireless/qa/mobileharness/shared/model/job", @@ -138,7 +137,7 @@ java_library( srcs = ["AndroidNativeBinJobValidator.java"], deps = [ ":job_validator", - "//src/java/com/google/wireless/qa/mobileharness/shared:exception", + "//src/java/com/google/devtools/mobileharness/api/model/error", "//src/java/com/google/wireless/qa/mobileharness/shared/api/spec:android_native_bin_spec", "//src/java/com/google/wireless/qa/mobileharness/shared/model/job", ],