aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Desprez <jdesprez@google.com>2022-04-07 16:42:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-04-07 16:42:01 +0000
commitab0789491d652e7818b51cae805be9ef6e708aef (patch)
tree9c34d8b4af199137377d4b99a3548f59a34419c1
parentce262ce0bc4653cd81cdfe5192e2a3dbaa2337d2 (diff)
parentb5e3d8eda60f3cecb5955bb2ff7a831f64636f1d (diff)
downloadcsuite-ab0789491d652e7818b51cae805be9ef6e708aef.tar.gz
Merge "Add an error categorization to targetSetupError"
-rw-r--r--harness/src/main/java/com/android/compatibility/targetprep/CheckGmsPreparer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/harness/src/main/java/com/android/compatibility/targetprep/CheckGmsPreparer.java b/harness/src/main/java/com/android/compatibility/targetprep/CheckGmsPreparer.java
index 24c2762..4e4d565 100644
--- a/harness/src/main/java/com/android/compatibility/targetprep/CheckGmsPreparer.java
+++ b/harness/src/main/java/com/android/compatibility/targetprep/CheckGmsPreparer.java
@@ -20,6 +20,7 @@ import com.android.tradefed.config.Option;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.invoker.TestInformation;
import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.error.DeviceErrorIdentifier;
import com.android.tradefed.targetprep.ITargetPreparer;
import com.android.tradefed.targetprep.TargetSetupError;
import com.android.tradefed.util.CommandResult;
@@ -58,7 +59,8 @@ public final class CheckGmsPreparer implements ITargetPreparer {
mEnable = false;
throw new TargetSetupError(
"GMS required but did not detect a running GMS process after device reboot",
- testInfo.getDevice().getDeviceDescriptor());
+ testInfo.getDevice().getDeviceDescriptor(),
+ DeviceErrorIdentifier.DEVICE_UNEXPECTED_RESPONSE);
}
}