commit 9ada400e98451d3ff39ea284be5c205c8c8a3f95
author Rob Carr <racarr@google.com> Tue Oct 20 23:30:12 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 20 23:30:12 2015 +0000
tree 412ce2e03d492e53cf94138bae4a71c6aead4bf0
parent 3554d62ca02bf6bc7777d1b22699876ec388fe6c
parent f1ddb5e090d553bf6ddc50a35b455fade3e905b4

Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index bf63931..17a86ca 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2467,8 +2467,13 @@
     final void doPendingActivityLaunchesLocked(boolean doResume) {
         while (!mPendingActivityLaunches.isEmpty()) {
             PendingActivityLaunch pal = mPendingActivityLaunches.remove(0);
-            startActivityUncheckedLocked(pal.r, pal.sourceRecord, null, null, pal.startFlags,
-                    doResume && mPendingActivityLaunches.isEmpty(), null, null);
+
+            try {
+                startActivityUncheckedLocked(pal.r, pal.sourceRecord, null, null, pal.startFlags,
+                                             doResume && mPendingActivityLaunches.isEmpty(), null, null);
+            } catch (Exception e) {
+                Slog.w(TAG, "Exception during pending activity launch pal=" + pal, e);
+            }
         }
     }