Merge "VmTerminalApp: Log full output of resize2fs when failed" into main am: 22d6bf1117
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3382769
Change-Id: I90a30ff226b62d9ad4984bad8db17f435fb7c253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/InstalledImage.java b/android/TerminalApp/java/com/android/virtualization/terminal/InstalledImage.java
index f616b87..f318358 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/InstalledImage.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstalledImage.java
@@ -113,6 +113,7 @@
* 1024;
return roundUp(minSize);
} catch (NumberFormatException e) {
+ Log.e(TAG, "Failed to parse min size, p=" + p + ", result=" + result);
throw new IOException(e);
}
}
@@ -168,7 +169,12 @@
try {
Process process = new ProcessBuilder(command).redirectErrorStream(true).start();
process.waitFor();
- return new String(process.getInputStream().readAllBytes());
+ String result = new String(process.getInputStream().readAllBytes());
+ if (process.exitValue() != 0) {
+ Log.w(TAG, "Process returned with error, command=" + String.join(" ", command)
+ + ", exitValue=" + process.exitValue() + ", result=" + result);
+ }
+ return result;
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new IOException("Command interrupted", e);