Index: base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java |
diff --git a/base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java b/base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java |
index ac60fd556361c5c2e878fb2d80f46ef065118bea..397e8abf13799b955511155fee513bfabb92a0e0 100644 |
--- a/base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java |
+++ b/base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java |
@@ -52,7 +52,14 @@ public class ScreenshotOnFailureStatement extends Statement { |
return; |
} |
- UiDevice uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()); |
+ UiDevice uiDevice = null; |
+ try { |
+ uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()); |
+ } catch (RuntimeException ex) { |
+ Log.d(TAG, "Failed to initialize UiDevice", ex); |
+ return; |
+ } |
+ |
File screenshotFile = new File(screenshotFilePath); |
File screenshotDir = screenshotFile.getParentFile(); |
if (screenshotDir == null) { |