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

Commit 32210891 authored Oct 24, 2024 by Austin Borger Committed by Android (Google) Code Review Oct 24, 2024

Merge "Add new Motion Photo intents" into main

parents c4b3da52 3b4e0f13

core/java/android/content/Intent.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12833,6 +12833,8 @@ public class Intent implements Parcelable, Cloneable {
	private boolean isImageCaptureIntent() {		private boolean isImageCaptureIntent() {
	return (MediaStore.ACTION_IMAGE_CAPTURE.equals(mAction)		return (MediaStore.ACTION_IMAGE_CAPTURE.equals(mAction)
	\|\| MediaStore.ACTION_IMAGE_CAPTURE_SECURE.equals(mAction)		\|\| MediaStore.ACTION_IMAGE_CAPTURE_SECURE.equals(mAction)
			\|\| MediaStore.ACTION_MOTION_PHOTO_CAPTURE.equals(mAction)
			\|\| MediaStore.ACTION_MOTION_PHOTO_CAPTURE_SECURE.equals(mAction)
	\|\| MediaStore.ACTION_VIDEO_CAPTURE.equals(mAction));		\|\| MediaStore.ACTION_VIDEO_CAPTURE.equals(mAction));
	}		}

services/core/java/com/android/server/pm/DefaultCrossProfileIntentFiltersUtils.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -316,6 +316,8 @@ public class DefaultCrossProfileIntentFiltersUtils {
	/* letsPersonalDataIntoProfile= */ true)		/* letsPersonalDataIntoProfile= */ true)
	.addAction(MediaStore.ACTION_IMAGE_CAPTURE)		.addAction(MediaStore.ACTION_IMAGE_CAPTURE)
	.addAction(MediaStore.ACTION_IMAGE_CAPTURE_SECURE)		.addAction(MediaStore.ACTION_IMAGE_CAPTURE_SECURE)
			.addAction(MediaStore.ACTION_MOTION_PHOTO_CAPTURE)
			.addAction(MediaStore.ACTION_MOTION_PHOTO_CAPTURE_SECURE)
	.addAction(MediaStore.ACTION_VIDEO_CAPTURE)		.addAction(MediaStore.ACTION_VIDEO_CAPTURE)
	.addAction(MediaStore.Audio.Media.RECORD_SOUND_ACTION)		.addAction(MediaStore.Audio.Media.RECORD_SOUND_ACTION)
	.addAction(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA)		.addAction(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA)
	@@ -438,6 +440,8 @@ public class DefaultCrossProfileIntentFiltersUtils {
	/* letsPersonalDataIntoProfile= */ false)		/* letsPersonalDataIntoProfile= */ false)
	.addAction(MediaStore.ACTION_IMAGE_CAPTURE)		.addAction(MediaStore.ACTION_IMAGE_CAPTURE)
	.addAction(MediaStore.ACTION_IMAGE_CAPTURE_SECURE)		.addAction(MediaStore.ACTION_IMAGE_CAPTURE_SECURE)
			.addAction(MediaStore.ACTION_MOTION_PHOTO_CAPTURE)
			.addAction(MediaStore.ACTION_MOTION_PHOTO_CAPTURE_SECURE)
	.addAction(MediaStore.ACTION_VIDEO_CAPTURE)		.addAction(MediaStore.ACTION_VIDEO_CAPTURE)
	.addAction(MediaStore.Audio.Media.RECORD_SOUND_ACTION)		.addAction(MediaStore.Audio.Media.RECORD_SOUND_ACTION)
	.addAction(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA)		.addAction(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA)

services/core/java/com/android/server/wm/ActivityTaskSupervisor.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -242,6 +242,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
	static {		static {
	ACTION_TO_RUNTIME_PERMISSION.put(MediaStore.ACTION_IMAGE_CAPTURE,		ACTION_TO_RUNTIME_PERMISSION.put(MediaStore.ACTION_IMAGE_CAPTURE,
	Manifest.permission.CAMERA);		Manifest.permission.CAMERA);
			ACTION_TO_RUNTIME_PERMISSION.put(MediaStore.ACTION_MOTION_PHOTO_CAPTURE,
			Manifest.permission.CAMERA);
	ACTION_TO_RUNTIME_PERMISSION.put(MediaStore.ACTION_VIDEO_CAPTURE,		ACTION_TO_RUNTIME_PERMISSION.put(MediaStore.ACTION_VIDEO_CAPTURE,
	Manifest.permission.CAMERA);		Manifest.permission.CAMERA);
	ACTION_TO_RUNTIME_PERMISSION.put(Intent.ACTION_CALL,		ACTION_TO_RUNTIME_PERMISSION.put(Intent.ACTION_CALL,