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

Commit b28fbc09 authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge "Make the condition of DISABLE_RECENT more robust in launch GCA CUJ"... 

Merge "Make the condition of DISABLE_RECENT more robust in launch GCA CUJ" into udc-dev am: 3875579d am: 4004a8df

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



Change-Id: I4052978d6e559eb7f211ec69a6544c5fb2b1adea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b08b096 4004a8df

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+2 −1
Original line number Diff line number Diff line
@@ -1954,7 +1954,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
                startKeyguardExitAnimation(0, 0);

            }



            mPowerGestureIntercepted = mUpdateMonitor.isSecureCameraLaunchedOverKeyguard();

            mPowerGestureIntercepted =

                    isOccluded && mUpdateMonitor.isSecureCameraLaunchedOverKeyguard();



            if (mOccluded != isOccluded) {

                mOccluded = isOccluded;