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

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

Merge "Perform activityIdleInternal in correct order."

parents 31315800 8be5ea3b

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

+5 −5
Original line number Diff line number Diff line
@@ -4371,11 +4371,11 @@ public final class ActivityManagerService extends ActivityManagerNative 
    @Override

    public final void activityIdle(IBinder token, Configuration config, boolean stopProfiling) {

        final long origId = Binder.clearCallingIdentity();

        if (stopProfiling) {

        synchronized (this) {

            ActivityStack stack = ActivityRecord.getStackLocked(token);

            if (stack != null) {

                ActivityRecord r = stack.activityIdleInternalLocked(token, false, config);

                if (stopProfiling) {

                    if ((mProfileProc == r.app) && (mProfileFd != null)) {

                        try {

                            mProfileFd.close();