1 files changed, 1 insertions, 9 deletions
diff --git a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
index b89e9ac..8f1fecd 100644
--- a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
+++ b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
@@ -93,16 +93,8 @@ public class AppRTCDemoActivity extends Activity
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    // Since the error-handling of this demo consists of throwing
-    // RuntimeExceptions and we assume that'll terminate the app, we install
-    // this default handler so it's applied to background threads as well.
     Thread.setDefaultUncaughtExceptionHandler(
-        new Thread.UncaughtExceptionHandler() {
-          public void uncaughtException(Thread t, Throwable e) {
-            e.printStackTrace();
-            System.exit(-1);
-          }
-        });
+        new UnhandledExceptionHandler(this));
 
     PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
     wakeLock = powerManager.newWakeLock(