Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 am: 894dd2b078

Browse Source 
am: a153a8072c

* commit 'a153a8072c0a28c36db2489a2ba13b1fc8e179db':
  Catch exceptions thrown by pending activity launches.
This commit is contained in:
Rob Carr
2015-10-21 00:06:43 +00:00
committed by android-build-merger
parent fc5c6090ec a153a8072c
commit e7413fc53f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -2468,8 +2468,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);
}
}
}