diff options
| author | 2022-07-08 05:33:08 +0000 | |
|---|---|---|
| committer | 2022-07-08 05:33:08 +0000 | |
| commit | 7736d6823238c8d35687d16380752a347902f7f1 (patch) | |
| tree | 35e8067c09cdfc54ce9b1494f504678c60bb380d | |
| parent | 633ccd13a762010d27df2bd950ade29dc8bb54b1 (diff) | |
| parent | 1aeb6f1acaeee3b36cd8f3d9dee162dfed44625b (diff) | |
Merge "Fixes bug where the camera app would launch below the lock-screen" into tm-qpr-dev am: 30ee980ece am: 1aeb6f1aca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19214502
Change-Id: I37f2b59e1f1d5116cef8f642f2be9ce50b944a0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt b/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt index 4986fe85af19..99267e8ee1c9 100644 --- a/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt @@ -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() } /** |