Merge "Change name of setShouldScreenCallFurther" am: cebf791676 am: ddbfa780eb (166ab00c) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -8036,7 +8036,7 @@ package android.telecom {
		}

		public static class CallScreeningService.CallResponse.Builder {
		method public android.telecom.CallScreeningService.CallResponse.Builder setShouldScreenCallFurther(boolean);
		method @NonNull 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
		@@ -2944,7 +2944,7 @@ package android.telecom {
		}

		public static class CallScreeningService.CallResponse.Builder {
		method public android.telecom.CallScreeningService.CallResponse.Builder setShouldScreenCallFurther(boolean);
		method @NonNull public android.telecom.CallScreeningService.CallResponse.Builder setShouldScreenCallViaAudioProcessing(boolean);
		}

		public abstract class Conference extends android.telecom.Conferenceable {

telecomm/java/android/telecom/Call.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -1512,7 +1512,6 @@ public final class Call {
		*/
		@SystemApi
		@TestApi
		//@RequiresPermission(android.Manifest.permission.BACKGROUND_CALL_AUDIO)
		public void enterBackgroundAudioProcessing() {
		if (mState != STATE_ACTIVE && mState != STATE_RINGING) {
		throw new IllegalStateException("Call must be active or ringing");
		@@ -1534,7 +1533,6 @@ public final class Call {
		*/
		@SystemApi
		@TestApi
		//@RequiresPermission(android.Manifest.permission.BACKGROUND_CALL_AUDIO)
		public void exitBackgroundAudioProcessing(boolean shouldRing) {
		if (mState != STATE_AUDIO_PROCESSING) {
		throw new IllegalStateException("Call must in the audio processing state");

telecomm/java/android/telecom/CallScreeningService.java

+13 −12

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ public abstract class CallScreeningService extends Service {
		private final boolean mShouldSilenceCall;
		private final boolean mShouldSkipCallLog;
		private final boolean mShouldSkipNotification;
		private final boolean mShouldScreenCallFurther;
		private final boolean mShouldScreenCallViaAudioProcessing;

		private CallResponse(
		boolean shouldDisallowCall,
		@@ -152,13 +152,13 @@ public abstract class CallScreeningService extends Service {
		boolean shouldSilenceCall,
		boolean shouldSkipCallLog,
		boolean shouldSkipNotification,
		boolean shouldScreenCallFurther) {
		boolean shouldScreenCallViaAudioProcessing) {
		if (!shouldDisallowCall
		&& (shouldRejectCall \|\| shouldSkipCallLog \|\| shouldSkipNotification)) {
		throw new IllegalStateException("Invalid response state for allowed call.");
		}

		if (shouldDisallowCall && shouldScreenCallFurther) {
		if (shouldDisallowCall && shouldScreenCallViaAudioProcessing) {
		throw new IllegalStateException("Invalid response state for allowed call.");
		}

		@@ -167,7 +167,7 @@ public abstract class CallScreeningService extends Service {
		mShouldSkipCallLog = shouldSkipCallLog;
		mShouldSkipNotification = shouldSkipNotification;
		mShouldSilenceCall = shouldSilenceCall;
		mShouldScreenCallFurther = shouldScreenCallFurther;
		mShouldScreenCallViaAudioProcessing = shouldScreenCallViaAudioProcessing;
		}

		/*
		@@ -211,8 +211,8 @@ public abstract class CallScreeningService extends Service {
		* for further screening of the call.
		* @hide
		*/
		public boolean getShouldScreenCallFurther() {
		return mShouldScreenCallFurther;
		public boolean getShouldScreenCallViaAudioProcessing() {
		return mShouldScreenCallViaAudioProcessing;
		}

		public static class Builder {
		@@ -221,7 +221,7 @@ public abstract class CallScreeningService extends Service {
		private boolean mShouldSilenceCall;
		private boolean mShouldSkipCallLog;
		private boolean mShouldSkipNotification;
		private boolean mShouldScreenCallFurther;
		private boolean mShouldScreenCallViaAudioProcessing;

		/**
		* Sets whether the incoming call should be blocked.
		@@ -285,13 +285,14 @@ public abstract class CallScreeningService extends Service {
		* This request will only be honored if the {@link CallScreeningService} shares the same
		* uid as the default dialer app. Otherwise, the call will go through as usual.
		*
		* @param shouldScreenCallFurther Whether to request further call screening.
		* @param shouldScreenCallViaAudioProcessing Whether to request further call screening.
		* @hide
		*/
		@SystemApi
		@TestApi
		public Builder setShouldScreenCallFurther(boolean shouldScreenCallFurther) {
		mShouldScreenCallFurther = shouldScreenCallFurther;
		public @NonNull Builder setShouldScreenCallViaAudioProcessing(
		boolean shouldScreenCallViaAudioProcessing) {
		mShouldScreenCallViaAudioProcessing = shouldScreenCallViaAudioProcessing;
		return this;
		}

		@@ -302,7 +303,7 @@ public abstract class CallScreeningService extends Service {
		mShouldSilenceCall,
		mShouldSkipCallLog,
		mShouldSkipNotification,
		mShouldScreenCallFurther);
		mShouldScreenCallViaAudioProcessing);
		}
		}
		}
		@@ -380,7 +381,7 @@ public abstract class CallScreeningService extends Service {
		new ComponentName(getPackageName(), getClass().getName()));
		} else if (response.getSilenceCall()) {
		mCallScreeningAdapter.silenceCall(callDetails.getTelecomCallId());
		} else if (response.getShouldScreenCallFurther()) {
		} else if (response.getShouldScreenCallViaAudioProcessing()) {
		mCallScreeningAdapter.screenCallFurther(callDetails.getTelecomCallId());
		} else {
		mCallScreeningAdapter.allowCall(callDetails.getTelecomCallId());