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

Commit 6c34789d authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge "Remove force transition logic when keyguard is occluded." into... 

Merge "Remove force transition logic when keyguard is occluded." into sc-v2-dev am: c062a021 am: 3ae8b5f4

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

Change-Id: Ibee673bff19a6107f2451811029af346d32f486a
parents c2e5825f 3ae8b5f4

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

+1 −10
Original line number Original line Diff line number Diff line
@@ -375,7 +375,7 @@ class KeyguardController { 
        // TODO(b/113840485): Handle app transition for individual display, and apply occluded

        // TODO(b/113840485): Handle app transition for individual display, and apply occluded

        // state change to secondary displays.

        // state change to secondary displays.

        // For now, only default display fully supports occluded change. Other displays only

        // For now, only default display fully supports occluded change. Other displays only

        // updates keygaurd sleep token on that display.

        // updates keyguard sleep token on that display.

        if (displayId != DEFAULT_DISPLAY) {

        if (displayId != DEFAULT_DISPLAY) {

            updateKeyguardSleepToken(displayId);

            updateKeyguardSleepToken(displayId);

            return;

            return;
@@ -390,15 +390,6 @@ class KeyguardController { 
                                isDisplayOccluded(DEFAULT_DISPLAY)

                                isDisplayOccluded(DEFAULT_DISPLAY)

                                        ? TRANSIT_KEYGUARD_OCCLUDE

                                        ? TRANSIT_KEYGUARD_OCCLUDE

                                        : TRANSIT_KEYGUARD_UNOCCLUDE, 0 /* flags */);

                                        : TRANSIT_KEYGUARD_UNOCCLUDE, 0 /* flags */);

                // When the occluding activity also turns on the display, visibility of the activity

                // can be committed before KEYGUARD_OCCLUDE transition is handled.

                // Set mRequestForceTransition flag to make sure that the app transition animation

                // is applied for such case.

                // TODO(b/194243906): Fix this before enabling the remote keyguard animation.

                if (WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation

                        && topActivity != null) {

                    topActivity.mRequestForceTransition = true;

                }

                updateKeyguardSleepToken(DEFAULT_DISPLAY);

                updateKeyguardSleepToken(DEFAULT_DISPLAY);

                mWindowManager.executeAppTransition();

                mWindowManager.executeAppTransition();

            } finally {

            } finally {