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

Commit 1aeb6f1a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixes bug where the camera app would launch below the lock-screen" into... 

Merge "Fixes bug where the camera app would launch below the lock-screen" into tm-qpr-dev am: 30ee980e

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



Change-Id: Iedd003a9d165e1a4c11de0d332b93bee5dca5852
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b33d708 30ee980e

packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt

+7 −0
Original line number Diff line number Diff line
@@ -125,6 +125,13 @@ class CameraGestureHelper @Inject constructor( 
            // launched from behind the lock-screen.

            activityStarter.startActivity(intent, false /* dismissShade */)

        }



        // Call this to make sure that the keyguard returns if the app that is being launched

        // crashes after a timeout.

        centralSurfaces.startLaunchTransitionTimeout()

        // Call this to make sure the keyguard is ready to be dismissed once the next intent is

        // handled by the OS (in our case it is the activity we started right above)

        centralSurfaces.readyForKeyguardDone()

    }



    /**