Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ada400e authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

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

parents 3554d62c f1ddb5e0

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

+7 −2
Original line number Diff line number Diff line
@@ -2467,8 +2467,13 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    final void doPendingActivityLaunchesLocked(boolean doResume) {

        while (!mPendingActivityLaunches.isEmpty()) {

            PendingActivityLaunch pal = mPendingActivityLaunches.remove(0);



            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);

            }

        }

    }