1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java b/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java
index a9aae9dfc..f370f9475 100644
--- a/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java
+++ b/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java
@@ -93,7 +93,8 @@ public class CpuThrottlingWaiter implements ITargetPreparer {
                         "cat /sys/devices/system/cpu/*/cpufreq/cpuinfo_max_freq");
                 CLog.w("Current CPU frequencies:\n%s", result);
                 if (mAbortOnTimeout) {
-                    throw new TargetSetupError("cores are still throttled after wait timeout");
+                    throw new TargetSetupError("cores are still throttled after wait timeout",
+                            device.getDeviceDescriptor());
                 }
                 break; // while loop
             }