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

Commit c878a3cd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add CAPTURE_AUDIO_OUTPUT permission requirement" am: a9034824 

Change-Id: I9ca6fcccd81c7349ee820e92236ce5bda70dd16a
parents aa078c03 a9034824

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7922,7 +7922,7 @@ package android.telecom { 
  }















  public static class CallScreeningService.CallResponse.Builder {













    method @NonNull public android.telecom.CallScreeningService.CallResponse.Builder setShouldScreenCallViaAudioProcessing(boolean);













    method @NonNull @RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_OUTPUT) public android.telecom.CallScreeningService.CallResponse.Builder setShouldScreenCallViaAudioProcessing(boolean);















  }





























  public abstract class Conference extends android.telecom.Conferenceable {

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -3002,7 +3002,7 @@ package android.telecom {













  }































  public static class CallScreeningService.CallResponse.Builder {













    method @NonNull public android.telecom.CallScreeningService.CallResponse.Builder setShouldScreenCallViaAudioProcessing(boolean);













    method @NonNull @RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_OUTPUT) public android.telecom.CallScreeningService.CallResponse.Builder setShouldScreenCallViaAudioProcessing(boolean);















  }































  public abstract class Conference extends android.telecom.Conferenceable {

































telecomm/java/android/telecom/CallScreeningService.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -16,7 +16,9 @@





























package android.telecom;





























import android.Manifest;















import android.annotation.NonNull;













import android.annotation.RequiresPermission;















import android.annotation.SdkConstant;















import android.annotation.SystemApi;















import android.annotation.TestApi;










@@ -290,6 +292,7 @@ public abstract class CallScreeningService extends Service {













             */















            @SystemApi















            @TestApi













            @RequiresPermission(Manifest.permission.CAPTURE_AUDIO_OUTPUT)















            public @NonNull Builder setShouldScreenCallViaAudioProcessing(















                    boolean shouldScreenCallViaAudioProcessing) {















                mShouldScreenCallViaAudioProcessing = shouldScreenCallViaAudioProcessing;