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

Commit 7ab7d832 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Work around issue #3241701: crash in ActivityThread.handleWindowVisibility"

parents bb3e4cf9 bfddc0fe

core/java/android/app/ActivityThread.java

+6 −0
Original line number Diff line number Diff line
@@ -2592,6 +2592,12 @@ public final class ActivityThread { 


    private final void handleWindowVisibility(IBinder token, boolean show) {

        ActivityClientRecord r = mActivities.get(token);

        

        if (r == null) {

            Log.w(TAG, "handleWindowVisibility: no activity for token " + token);

            return;

        }

        

        if (!show && !r.stopped) {

            performStopActivityInner(r, null, show, false);

        } else if (show && r.stopped) {