diff options
| author | Evan Rosky <erosky@google.com> | 2020-11-25 23:59:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-25 23:59:43 +0000 |
| commit | 0aa58c581d502aca55ef02e79bbc7e97c2d84271 (patch) | |
| tree | 3e26f7351e5e84ba033edfdf53a3f9ca46c094cf | |
| parent | bce7448420bcdcc788fdbaffe1e259bd7adebf96 (diff) | |
| parent | 4563bf5b608a3036e893d7060193145b569bdb8c (diff) | |
Merge "Fix incomplete merge"
| -rw-r--r-- | services/core/java/com/android/server/wm/KeyguardController.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java index c3b6149482e2..ebd91a093326 100644 --- a/services/core/java/com/android/server/wm/KeyguardController.java +++ b/services/core/java/com/android/server/wm/KeyguardController.java @@ -206,9 +206,8 @@ class KeyguardController { mAodShowing ? 1 : 0, 1 /* keyguardGoingAway */, "keyguardGoingAway"); - mRootWindowContainer.getDefaultDisplay() - .prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY, - convertTransitFlags(flags)); + mRootWindowContainer.getDefaultDisplay().requestTransitionAndLegacyPrepare( + TRANSIT_KEYGUARD_GOING_AWAY, convertTransitFlags(flags)); updateKeyguardSleepToken(); // Some stack visibility might change (e.g. docked stack) |