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

Commit daa57be1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Added RECORD_AUDIO permission for MIC" into main am: 938bf3a5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2260263



Change-Id: Icf4f1f680a82ee9b91a6334420acc68da4bbcc6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2faac87d 938bf3a5

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -24792,7 +24792,7 @@ package android.media { 
    method public android.view.Surface getSurface();

    method public boolean isPrivacySensitive();

    method public void pause() throws java.lang.IllegalStateException;

    method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;

    method @RequiresPermission(value=android.Manifest.permission.RECORD_AUDIO, conditional=true) public void prepare() throws java.io.IOException, java.lang.IllegalStateException;

    method public void registerAudioRecordingCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.AudioRecordingCallback);

    method public void release();

    method public void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);
@@ -24833,7 +24833,7 @@ package android.media { 
    method public void setVideoProfile(@NonNull android.media.EncoderProfiles.VideoProfile);

    method public void setVideoSize(int, int) throws java.lang.IllegalStateException;

    method public void setVideoSource(int) throws java.lang.IllegalStateException;

    method public void start() throws java.lang.IllegalStateException;

    method @RequiresPermission(value=android.Manifest.permission.RECORD_AUDIO, conditional=true) public void start() throws java.lang.IllegalStateException;

    method public void stop() throws java.lang.IllegalStateException;

    method public void unregisterAudioRecordingCallback(@NonNull android.media.AudioManager.AudioRecordingCallback);

    field public static final int MEDIA_ERROR_SERVER_DIED = 100; // 0x64

media/java/android/media/MediaRecorder.java

+2 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,7 @@ public class MediaRecorder implements AudioRouting, 
     * start() or before setOutputFormat().

     * @throws IOException if prepare fails otherwise.

     */

    @RequiresPermission(value = android.Manifest.permission.RECORD_AUDIO, conditional = true)

    public void prepare() throws IllegalStateException, IOException

    {

        if (mPath != null) {
@@ -1337,6 +1338,7 @@ public class MediaRecorder implements AudioRouting, 
     * @throws IllegalStateException if it is called before

     * prepare() or when the camera is already in use by another app.

     */

    @RequiresPermission(value = android.Manifest.permission.RECORD_AUDIO, conditional = true)

    public native void start() throws IllegalStateException;



    /**