WifiDiagnostics: Add a timeout for logcat calls

The logcat shell command currently blocks forever if something is wrong.
Add a timeout to error out after 500 ms.

Bug: 157062041
Test: Verified that WifiDiagnostics dump is not broken.
Change-Id: Id67082c5fedf259790950acbffa41cfb042c415a

1 files changed, 5 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/WifiDiagnostics.java b/service/java/com/android/server/wifi/WifiDiagnostics.java
index 4ac982063..2ba90c968 100644
--- a/service/java/com/android/server/wifi/WifiDiagnostics.java
+++ b/service/java/com/android/server/wifi/WifiDiagnostics.java
@@ -44,6 +44,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.zip.Deflater;
 
@@ -107,6 +108,9 @@ class WifiDiagnostics extends BaseWifiDiagnostics {
     /** Minimum dump period with same error code */
     public static final long MIN_DUMP_TIME_WINDOW_MILLIS = 10 * 60 * 1000; // 10 mins
 
+    // Timeout for logcat
+    private static final int LOGCAT_TIMEOUT_MILLIS = 500;
+
     private long mLastBugReportTime;
 
     @VisibleForTesting public static final String FIRMWARE_DUMP_SECTION_HEADER =
@@ -720,7 +724,7 @@ class WifiDiagnostics extends BaseWifiDiagnostics {
             while ((line = reader.readLine()) != null) {
                 lines.add(line);
             }
-            process.waitFor();
+            process.waitFor(LOGCAT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
         } catch (InterruptedException|IOException e) {
             mLog.dump("Exception while capturing logcat: %").c(e.toString()).flush();
         }