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

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

Change-Id: Iedd003a9d165e1a4c11de0d332b93bee5dca5852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-07-08 05:08:37 +00:00
committed by Automerger Merge Worker

View File

@@ -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()
}
/**