summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRob Carr <racarr@google.com>2015-10-20 23:30:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-20 23:30:12 +0000
commit9ada400e98451d3ff39ea284be5c205c8c8a3f95 (patch)
tree412ce2e03d492e53cf94138bae4a71c6aead4bf0 /services
parent3554d62ca02bf6bc7777d1b22699876ec388fe6c (diff)
parentf1ddb5e090d553bf6ddc50a35b455fade3e905b4 (diff)
downloadframeworks_base-9ada400e98451d3ff39ea284be5c205c8c8a3f95.zip
frameworks_base-9ada400e98451d3ff39ea284be5c205c8c8a3f95.tar.gz
frameworks_base-9ada400e98451d3ff39ea284be5c205c8c8a3f95.tar.bz2
Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/am/ActivityStackSupervisor.java9
1 files changed, 7 insertions, 2 deletions
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 @@ public final class ActivityStackSupervisor implements DisplayListener {
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);
+ }
}
}