diff options
| author | Julien Desprez <jdesprez@google.com> | 2022-04-07 18:34:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-07 18:34:02 +0000 |
| commit | 72ccba6b845543e6ae005e4771d932ed4f2c7e74 (patch) | |
| tree | 3499e2105ac81ed3ac298bda668ecff397eacfbf | |
| parent | f83b80f069b65dd031c4456bb8de29b7cc4378f8 (diff) | |
| parent | 516cceaf1b83dbd636cadd7df2f129b35712ea5f (diff) | |
| download | csuite-72ccba6b845543e6ae005e4771d932ed4f2c7e74.tar.gz | |
Merge "Add an error categorization to targetSetupError" am: ab0789491d am: 8d8b3281d9 am: 79bc2ff994 am: ba95143341 am: 516cceaf1b
Original change: https://android-review.googlesource.com/c/platform/test/app_compat/csuite/+/2048464
Change-Id: I51fa8e43947f276e022a91c3d4c9182e4a49b88a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | harness/src/main/java/com/android/compatibility/targetprep/CheckGmsPreparer.java | 4 |
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); } } |