Changing catch-all to catch Throwable instead of just Exception

project-chip · Feb 7, 2023 · 9602c19 · 9602c19
1 parent eb71bf7
commit 9602c19
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/FailureCallback.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/FailureCallback.java
@@ -27,8 +27,8 @@ public abstract class FailureCallback {
   private final void handleInternal(int errorCode, String errorMessage) {
     try {
       handle(new MatterError(errorCode, errorMessage));
-    } catch (Exception e) {
-      Log.e(TAG, "FailureCallback::Caught an unhandled exception from the client: " + e);
+    } catch (Throwable t) {
+      Log.e(TAG, "FailureCallback::Caught an unhandled Throwable from the client: " + t);
     }
   }
 }
diff --git a/...s/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/MatterCallbackHandler.java b/...s/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/MatterCallbackHandler.java
@@ -27,8 +27,8 @@ public abstract class MatterCallbackHandler {
   private final void handleInternal(int errorCode, String errorMessage) {
     try {
       handle(new MatterError(errorCode, errorMessage));
-    } catch (Exception e) {
-      Log.e(TAG, "MatterCallbackHandler::Caught an unhandled exception from the client: " + e);
+    } catch (Throwable t) {
+      Log.e(TAG, "MatterCallbackHandler::Caught an unhandled Throwable from the client: " + t);
     }
   }
 }
diff --git a/...ng-app/android/App/app/src/main/jni/com/chip/casting/SubscriptionEstablishedCallback.java b/...ng-app/android/App/app/src/main/jni/com/chip/casting/SubscriptionEstablishedCallback.java
@@ -27,10 +27,10 @@ public abstract class SubscriptionEstablishedCallback {
   private void handleInternal() {
     try {
       handle();
-    } catch (Exception e) {
+    } catch (Throwable t) {
       Log.e(
           TAG,
-          "SubscriptionEstablishedCallback::Caught an unhandled exception from the client: " + e);
+          "SubscriptionEstablishedCallback::Caught an unhandled Throwable from the client: " + t);
     }
   }
 }
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/SuccessCallback.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/SuccessCallback.java
@@ -27,8 +27,8 @@ public abstract class SuccessCallback<R> {
   public void handleInternal(R response) {
     try {
       handle(response);
-    } catch (Exception e) {
-      Log.e(TAG, "SuccessCallback::Caught an unhandled exception from the client: " + e);
+    } catch (Throwable t) {
+      Log.e(TAG, "SuccessCallback::Caught an unhandled Throwable from the client: " + t);
     }
   }
 }