commit 12fa2d7f63163939dc5422b43912407fb0145406
author Zach Johnson <zachoverflow@google.com> Thu Jun 02 18:11:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 02 18:11:34 2016 +0000
tree 2e2614e76451f733fe10091e568d438e87c23b79
parent 94d2dc6136b5a543b6268040b00924112ae9aae3
parent 76a718e0816da0df026a160fb4dfb9f12e46848e

Fix CpuThrottlingWaiter cat failures
am: 76a718e081

* commit '76a718e0816da0df026a160fb4dfb9f12e46848e':
  Fix CpuThrottlingWaiter cat failures

Change-Id: I50392d22db7a26d8a0dee828fca4d729d4feaf2c

src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java

diff --git a/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java b/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java
index 06ba6c3..a9aae9d 100644
--- a/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java
+++ b/src/com/android/tradefed/targetprep/CpuThrottlingWaiter.java
@@ -116,7 +116,7 @@
     protected Map<String, String> getCpuMaxFreqs(ITestDevice device)
             throws DeviceNotAvailableException {
         Map<String, String> ret = new HashMap<>();
-        String result = device.executeShellCommand("ls -d /sys/devices/system/cpu/cpu*/cpufreq");
+        String result = device.executeShellCommand("ls -1 -d /sys/devices/system/cpu/cpu*/cpufreq");
         String[] lines = result.split("\r?\n");
         List<String> cpuPaths = new ArrayList<>();
         for (String line : lines) {