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

Commit 00633e02 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Move startActivityUncheckedLocked to Supervisor"

parents 4f42c174 8849a5ec

services/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2524,7 +2524,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
        }

        for (int i=0; i<N; i++) {

            PendingActivityLaunch pal = mPendingActivityLaunches.get(i);

            pal.stack.startActivityUncheckedLocked(pal.r, pal.sourceRecord, pal.startFlags,

            mStackSupervisor.startActivityUncheckedLocked(pal.r, pal.sourceRecord, pal.startFlags,

                    doResume && i == (N-1), null);

        }

        mPendingActivityLaunches.clear();

services/java/com/android/server/am/ActivityStack.java

+24 −384

File changed.

Preview size limit exceeded, changes collapsed.

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

+391 −2

File changed.

Preview size limit exceeded, changes collapsed.