aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Desprez <jdesprez@google.com>2020-07-17 16:50:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-17 16:50:18 +0000
commit8a0f727716b14e837d5cc85f7a47fa83f7521100 (patch)
treee5daa39db7688fa33bb156a2d13590c228a674a0
parent2e88a7ed88fd97ad82e0386d7819ede4937e91ad (diff)
parentd54180f7254194a7024bf1bc177fe98b81c283c0 (diff)
downloadtradefederation-8a0f727716b14e837d5cc85f7a47fa83f7521100.tar.gz
Merge "Add error to perform adb action" am: b678463616 am: cb02069c64 am: 502e1577fc am: 9f712dc1fc am: d54180f725
Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/+/1364899 Change-Id: Icfaeca92e3f46b205ebeb727c8d77949f4bfc43d
-rw-r--r--src/com/android/tradefed/device/NativeDevice.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/tradefed/device/NativeDevice.java b/src/com/android/tradefed/device/NativeDevice.java
index fcd8635cb..2f90ad037 100644
--- a/src/com/android/tradefed/device/NativeDevice.java
+++ b/src/com/android/tradefed/device/NativeDevice.java
@@ -2099,9 +2099,13 @@ public class NativeDevice implements IManagedTestDevice {
recoverDevice();
}
if (retryAttempts > 0) {
- throw new DeviceUnresponsiveException(String.format("Attempted %s multiple times "
- + "on device %s without communication success. Aborting.", actionDescription,
- getSerialNumber()), getSerialNumber());
+ throw new DeviceUnresponsiveException(
+ String.format(
+ "Attempted %s multiple times "
+ + "on device %s without communication success. Aborting.",
+ actionDescription, getSerialNumber()),
+ getSerialNumber(),
+ DeviceErrorIdentifier.DEVICE_UNRESPONSIVE);
}
return false;
}