Merge "Fail an xTS-I step immediately if it fails to create the directory to save screenshot files." into android14-tests-dev
diff --git a/common/device-side/interactive/src/main/java/com/android/interactive/ScreenshotUtil.java b/common/device-side/interactive/src/main/java/com/android/interactive/ScreenshotUtil.java
index f53f6a6..64afa19 100644
--- a/common/device-side/interactive/src/main/java/com/android/interactive/ScreenshotUtil.java
+++ b/common/device-side/interactive/src/main/java/com/android/interactive/ScreenshotUtil.java
@@ -45,8 +45,9 @@
Environment.getExternalStorageDirectory().getAbsolutePath()
+ "/Documents/xts/screenshots/";
File file = new File(screenshotDir);
- if (!file.exists()) {
- file.mkdirs();
+ if (!file.exists() && !file.mkdirs()) {
+ // Let the steps that require screenshots fail immediately.
+ throw new RuntimeException("Failed to create " + screenshotDir + " directory on DUT.");
}
File screenshotFile =
