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

Commit 3150f9cf authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge "Stop animation when screen times out and the user turns on the phone."... 

Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: d80badd6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14964843

Change-Id: I2e8789edce68da3d8cc6d3dd5c3494c0e9cef1d6
parents fcc4ec05 d80badd6

services/core/java/com/android/server/wm/RootWindowContainer.java

+7 −2
Original line number Diff line number Diff line
@@ -221,6 +221,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
    // transaction from the global transaction.

    private final SurfaceControl.Transaction mDisplayTransaction;



    // The tag for the token to put root tasks on the displays to sleep.

    private static final String DISPLAY_OFF_SLEEP_TOKEN_TAG = "Display-off";



    /** The token acquirer to put root tasks on the displays to sleep */

    final ActivityTaskManagerInternal.SleepTokenAcquirer mDisplayOffTokenAcquirer;
@@ -450,7 +453,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        mService = service.mAtmService;

        mTaskSupervisor = mService.mTaskSupervisor;

        mTaskSupervisor.mRootWindowContainer = this;

        mDisplayOffTokenAcquirer = mService.new SleepTokenAcquirerImpl("Display-off");

        mDisplayOffTokenAcquirer = mService.new SleepTokenAcquirerImpl(DISPLAY_OFF_SLEEP_TOKEN_TAG);

    }



    boolean updateFocusedWindowLocked(int mode, boolean updateInputWindows) {
@@ -2654,12 +2657,14 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            Slog.d(TAG, "Remove non-exist sleep token: " + token + " from " + Debug.getCallers(6));

        }

        mSleepTokens.remove(token.mHashKey);



        final DisplayContent display = getDisplayContent(token.mDisplayId);

        if (display != null) {

            display.mAllSleepTokens.remove(token);

            if (display.mAllSleepTokens.isEmpty()) {

                mService.updateSleepIfNeededLocked();

                if (token.mTag.equals(DISPLAY_OFF_SLEEP_TOKEN_TAG)) {

                    display.mSkipAppTransitionAnimation = true;

                }

            }

        }

    }