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

Commit 1e910d17 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 

automerge: 005080e5

* commit '005080e5':
  Stop activity onVisibleBehindCanceled()
parents 950daf58 005080e5

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

+1 −1
Original line number Diff line number Diff line
@@ -6260,7 +6260,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            synchronized (this) {

                ActivityStack stack = ActivityRecord.getStackLocked(token);

                if (stack != null) {

                    stack.backgroundResourcesReleased(token);

                    stack.backgroundResourcesReleased();

                }

            }

        } finally {

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

+3 −2
Original line number Diff line number Diff line
@@ -3317,17 +3317,18 @@ final class ActivityStack { 
                mHandler.sendEmptyMessageDelayed(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG, 500);

            } else {

                Slog.e(TAG, "releaseBackgroundResources: activity " + r + " no longer running");

                backgroundResourcesReleased(r.appToken);

                backgroundResourcesReleased();

            }

        }

    }



    final void backgroundResourcesReleased(IBinder token) {

    final void backgroundResourcesReleased() {

        mHandler.removeMessages(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG);

        final ActivityRecord r = getVisibleBehindActivity();

        if (r != null) {

            mStackSupervisor.mStoppingActivities.add(r);

            setVisibleBehindActivity(null);

            mStackSupervisor.scheduleIdleTimeoutLocked(null);

        }

        mStackSupervisor.resumeTopActivitiesLocked();

    }