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

Commit 2a1242ee authored Dec 05, 2024 by Nan Wu

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

parent beed0e80

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ constructor(
		activityOptions.setDisallowEnterPictureInPictureWhileLaunching(true)
		activityOptions.rotationAnimationHint =
		WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS
		intent.collectExtraIntentKeys()
		try {
		activityTaskManager.startActivityAsUser(
		null,

packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterInternalImpl.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -313,6 +313,7 @@ constructor(
		// if it is volume panel.
		options.setDisallowEnterPictureInPictureWhileLaunching(true)
		}
		intent.collectExtraIntentKeys()
		try {
		result[0] =
		ActivityTaskManager.getService()

packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,7 @@ constructor(
		// if it is volume panel.
		options.setDisallowEnterPictureInPictureWhileLaunching(true)
		}
		intent.collectExtraIntentKeys()
		try {
		result[0] =
		ActivityTaskManager.getService()