Merge "Add CAPTURE_AUDIO_OUTPUT permission requirement" am: a90348248b

Change-Id: I9ca6fcccd81c7349ee820e92236ce5bda70dd16a
This commit is contained in:
Automerger Merge Worker
2020-03-06 11:22:32 +00:00
3 changed files with 5 additions and 2 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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;