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

Commit d16c8cf1 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by The Android Automerger
Browse files

Fix issue #6636731: Mariner animation ring gets stuck 

Weren't cleaning out any ActivityOptions that are still attached
to a finishing activity.

Bug: 6636731
Change-Id: If0520bbcbf1d4ce19d46ff769918893cefda9c87
parent 7a6f7767

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

+8 −1
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ final class ActivityRecord { 
        if (pendingResults != null) {

            pw.print(prefix); pw.print("pendingResults="); pw.println(pendingResults);

        }

        if (pendingOptions != null) {

            pw.print(prefix); pw.print("pendingOptions="); pw.println(pendingOptions);

        }

        if (uriPermissions != null) {

            if (uriPermissions.readUriPermissions != null) {

                pw.print(prefix); pw.print("readUriPermissions=");
@@ -453,6 +456,7 @@ final class ActivityRecord { 
            if (task != null && !finishing) {

                task.numActivities--;

            }

            clearOptionsLocked();

        }

    }
@@ -466,6 +470,9 @@ final class ActivityRecord { 
            if (task != null && inHistory) {

                task.numActivities--;

            }

            if (stopped) {

                clearOptionsLocked();

            }

        }

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,9 @@ final class ActivityStack { 
            mHandler.removeMessages(STOP_TIMEOUT_MSG, r);

            r.stopped = true;

            r.state = ActivityState.STOPPED;

            if (!r.finishing) {

            if (r.finishing) {

                r.clearOptionsLocked();

            } else {

                if (r.configDestroy) {

                    destroyActivityLocked(r, true, false, "stop-config");

                    resumeTopActivityLocked(null);