From e0ea4b74fb6706e60de3ffbd77241d2407f2a2db Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Thu, 15 Jun 2017 11:43:42 -0700
Subject: [PATCH] Catch Throwable instead of Exception.

AssertionFailedError is a Throwable and hence some logs which will
help debug the failures are not printed.

Bug: 38384021
Test: Verified that when the test throws AssertionFailedError, required
      logs are printed.

Change-Id: I6cc8e0172b8e30d268a50bdf9281d6828fc74810
---
 .../net/hostside/AbstractRestrictBackgroundNetworkTestCase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c4f63e2a3c..12b338f8e5 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 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
         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);