SystemUI: Add SCREEN_GESTURE as a CameraLaunchSourceModel

This fixes a SystemUI crash while launching camera with any off-screen gestures, logging it as follows: 08-13 11:13:59.748 4947 4947 D AndroidRuntime: Shutting down VM 08-13 11:13:59.749 4947 4947 E AndroidRuntime: FATAL EXCEPTION: main 08-13 11:13:59.749 4947 4947 E AndroidRuntime: Process: com.android.systemui, PID: 4947 08-13 11:13:59.749 4947 4947 E AndroidRuntime: java.lang.IllegalArgumentException: Invalid CameraLaunchSourceModel value: 4 08-13 11:13:59.749 4947 4947 E AndroidRuntime: at com.android.systemui.keyguard.domain.interactor.KeyguardInteractor$onCameraLaunchDetected$1$callback$1.onCameraLaunchGestureDetected(KeyguardInteractor.kt:29) 08-13 11:13:59.749 4947 4947 E AndroidRuntime: at com.android.systemui.statusbar.CommandQueue$H.handleMessage(CommandQueue.java:1743) 08-13 11:13:59.749 4947 4947 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:106) 08-13 11:13:59.749 4947 4947 E AndroidRuntime: at android.os.Looper.loopOnce(Looper.java:201) 08-13 11:13:59.749 4947 4947 E AndroidRuntime: at android.os.Looper.loop(Looper.java:288) 08-13 11:13:59.749 4947 4947 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:7979) 08-13 11:13:59.749 4947 4947 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method) 08-13 11:13:59.749 4947 4947 E AndroidRuntime: at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548) 08-13 11:13:59.749 4947 4947 E AndroidRuntime: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942) Change-Id: Ieca3bbbac9e91d56b748ff1f9aa2501c5f886d78
PixelOS-AOSP · Aug 14, 2023 · b64ed53 · b64ed53
1 parent 516b2cd
commit b64ed53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt
@@ -195,6 +195,8 @@ constructor(
                 CameraLaunchSourceModel.LIFT_TRIGGER
             StatusBarManager.CAMERA_LAUNCH_SOURCE_QUICK_AFFORDANCE ->
                 CameraLaunchSourceModel.QUICK_AFFORDANCE
+            StatusBarManager.CAMERA_LAUNCH_SOURCE_SCREEN_GESTURE  ->
+                CameraLaunchSourceModel.SCREEN_GESTURE
             else -> throw IllegalArgumentException("Invalid CameraLaunchSourceModel value: $value")
         }
     }

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/CameraLaunchSourceModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/shared/model/CameraLaunchSourceModel.kt
@@ -25,4 +25,6 @@ enum class CameraLaunchSourceModel {
     LIFT_TRIGGER,
     /** Quick affordance button has been pressed */
     QUICK_AFFORDANCE,
+    /** OffScreen Gestures Have Been Triggered **/
+    SCREEN_GESTURE,
 }