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

Commit ac7e50bd authored Nov 01, 2024 by Atneya Nair Committed by Android (Google) Code Review Nov 01, 2024

Merge "Update RADIO_TUNER to correct permission" into main

parents b06b81bc edde8b21

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -7604,7 +7604,7 @@ package android.media {
		public final class MediaRecorder.AudioSource {
		field @RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_OUTPUT) public static final int ECHO_REFERENCE = 1997; // 0x7cd
		field @RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_HOTWORD) public static final int HOTWORD = 1999; // 0x7cf
		field @RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_OUTPUT) public static final int RADIO_TUNER = 1998; // 0x7ce
		field @RequiresPermission(android.Manifest.permission.CAPTURE_TUNER_AUDIO_INPUT) public static final int RADIO_TUNER = 1998; // 0x7ce
		field @RequiresPermission(android.Manifest.permission.ACCESS_ULTRASOUND) public static final int ULTRASOUND = 2000; // 0x7d0
		}

media/java/android/media/MediaRecorder.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -387,13 +387,13 @@ public class MediaRecorder implements AudioRouting,
		/**
		* Audio source for capturing broadcast radio tuner output.
		* Capturing the radio tuner output requires the
		* {@link android.Manifest.permission#CAPTURE_AUDIO_OUTPUT} permission.
		* {@link android.Manifest.permission#CAPTURE_TUNER_AUDIO_INPUT} permission.
		* This permission is reserved for use by system components and is not available to
		* third-party applications.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_OUTPUT)
		@RequiresPermission(android.Manifest.permission.CAPTURE_TUNER_AUDIO_INPUT)
		public static final int RADIO_TUNER = 1998;

		/**