From 2a1242ee0fb27e23f8528234b03f7981956314c1 Mon Sep 17 00:00:00 2001 From: Nan Wu Date: Thu, 5 Dec 2024 16:48:58 +0000 Subject: Fix Camera app shortcut issue Double click power button to launch Camera app on pixel phone is blocked because the intent did not call collectExtraIntentKeys() method before calling ActivityTaskManager.getService().startActivityXXX() method. The class is actually used is LegacyActivityStarterInternalImpl. I am also fixing ActivityStarterInternalImpl and CameraGestureHelper just to be preventive. Bug: 380802071 Test: manual Flag: EXEMPT bugfix Change-Id: I9f00ea2b7f623dd1702272b895362de22d4061bd --- packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt | 1 + .../com/android/systemui/statusbar/phone/ActivityStarterInternalImpl.kt | 1 + .../systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt b/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt index b2d02edf3c45..a31e61f67e47 100644 --- a/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt @@ -107,6 +107,7 @@ constructor( activityOptions.setDisallowEnterPictureInPictureWhileLaunching(true) activityOptions.rotationAnimationHint = WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS + intent.collectExtraIntentKeys() try { activityTaskManager.startActivityAsUser( null, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterInternalImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterInternalImpl.kt index d1338eadb6b5..f2ef2f0ab48f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterInternalImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterInternalImpl.kt @@ -313,6 +313,7 @@ constructor( // if it is volume panel. options.setDisallowEnterPictureInPictureWhileLaunching(true) } + intent.collectExtraIntentKeys() try { result[0] = ActivityTaskManager.getService() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt index 1cca3ae0a2c0..d7cc65d22663 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt @@ -180,6 +180,7 @@ constructor( // if it is volume panel. options.setDisallowEnterPictureInPictureWhileLaunching(true) } + intent.collectExtraIntentKeys() try { result[0] = ActivityTaskManager.getService() -- cgit v1.2.3-59-g8ed1b