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

Commit 39844e38 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

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

am: e9188c77

* commit 'e9188c77':
  Fix black frame in finishing transition

Change-Id: Icab2e3d4b08ca90a6119ad7c457eae03cca5d940
parents bb8028fb e9188c77

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);

        }