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

Commit cffe389a authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Fix black frame in finishing transition" into nyc-dev

parents ea999ac8 4c5f7ff4

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

+2 −2
Original line number Diff line number Diff line
@@ -3434,8 +3434,8 @@ final class ActivityStack { 
                mWindowManager.executeAppTransition();

                mStackSupervisor.mWaitingVisibleActivities.add(r);

            }

            return finishCurrentActivityLocked(r,

                    r.visible ? FINISH_AFTER_VISIBLE : FINISH_AFTER_PAUSE, oomAdj) == null;

            return finishCurrentActivityLocked(r, (r.visible || r.nowVisible) ?

                    FINISH_AFTER_VISIBLE : FINISH_AFTER_PAUSE, oomAdj) == null;

        } else {

            if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Finish waiting for pause of: " + r);

        }