commit 39c610192a8350adba64fdf6869f9b560163cb80
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 27 01:14:52 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 27 01:14:52 2020 +0000
tree 0cfa4d683b0ae8b8435338c952de75d94b09ac1b
parent de9823243a73662c211a5d405511d6bcf4f1f0a6
parent 6f96376620b34b68c5896d25a315fc0f8b72ac80

Merge "Catching OOM exceptions in auto-investigator" into ub-launcher3-master

tests/src/com/android/launcher3/util/rule/FailureInvestigator.java

diff --git a/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java b/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
index ebf7991..e4f520f 100644
--- a/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
+++ b/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
@@ -102,7 +102,7 @@
             logSinceBoot =
                     UiDevice.getInstance(getInstrumentation())
                             .executeShellCommand("logcat -d -t " + systemBootTime.replace(" ", ""));
-        } catch (IOException e) {
+        } catch (IOException | OutOfMemoryError e) {
             return 0;
         }