commit 50a0d24df60921d33786786c7bceb23b238e5310
author Sudheer Shanka <sudheersai@google.com> Fri Jun 16 00:26:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 16 00:26:00 2017 +0000
tree 3e691d837288c614f132f5f6a658f1334dd237b4
parent d668fbd8028ae690e216a0ec0ec06fd1ad5b9476
parent 699a587e1cc53ec3e3a9d13a1c41b993112ded3f

Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3
am: 699a587e1c

Change-Id: Ifb3df8ea58c5a5a25a03d01ed58a731557f0f8aa

tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java

diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
index c4f63e2..12b338f 100644
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
+++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -812,7 +812,7 @@
         executeSilentShellCommand("am set-inactive " + TEST_APP2_PKG + " " + enabled );
         try {
             assertAppIdle(enabled); // Sanity check
-        } catch (Exception e) {
+        } catch (Throwable e) {
             final String afterStats = getUsageStatsDump();
             Log.d(TAG, "UsageStats before:\n" + beforeStats);
             Log.d(TAG, "UsageStats after:\n" + afterStats);