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

Commit 7866fa1d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add CAPTURE_AUDIO_OUTPUT permission requirement" am: a9034824 am:... 

Merge "Add CAPTURE_AUDIO_OUTPUT permission requirement" am: a9034824 am: c878a3cd am: 10e0a546

Change-Id: I30aa2ec7bf30a887bf6bc346566555925db5e9cc
parents d68e5030 10e0a546

api/system-current.txt

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

  }

















  public static class CallScreeningService.CallResponse.Builder {







  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 {







  public abstract class Conference extends android.telecom.Conferenceable {

























api/test-current.txt



+1
−1




























Original line number
Original line
Diff line number
Diff line








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









  }







  }































  public static class CallScreeningService.CallResponse.Builder {







  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 {







  public abstract class Conference extends android.telecom.Conferenceable {

































telecomm/java/android/telecom/CallScreeningService.java



+3
−0




























Original line number
Original line
Diff line number
Diff line








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





























package android.telecom;







package android.telecom;


































import android.Manifest;











import android.annotation.NonNull;







import android.annotation.NonNull;














import android.annotation.RequiresPermission;











import android.annotation.SdkConstant;







import android.annotation.SdkConstant;











import android.annotation.SystemApi;







import android.annotation.SystemApi;











import android.annotation.TestApi;







import android.annotation.TestApi;










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









             */







             */











            @SystemApi







            @SystemApi











            @TestApi







            @TestApi














            @RequiresPermission(Manifest.permission.CAPTURE_AUDIO_OUTPUT)











            public @NonNull Builder setShouldScreenCallViaAudioProcessing(







            public @NonNull Builder setShouldScreenCallViaAudioProcessing(











                    boolean shouldScreenCallViaAudioProcessing) {







                    boolean shouldScreenCallViaAudioProcessing) {











                mShouldScreenCallViaAudioProcessing = shouldScreenCallViaAudioProcessing;







                mShouldScreenCallViaAudioProcessing = shouldScreenCallViaAudioProcessing;