Merge "Add stubs for the new background call audio APIs"
diff --git a/src/com/android/server/telecom/CallScreeningServiceHelper.java b/src/com/android/server/telecom/CallScreeningServiceHelper.java
index a9341ab..79d5286 100644
--- a/src/com/android/server/telecom/CallScreeningServiceHelper.java
+++ b/src/com/android/server/telecom/CallScreeningServiceHelper.java
@@ -68,6 +68,11 @@
}
@Override
+ public void screenCallFurther(String callId) throws RemoteException {
+ // no-op; we don't allow this on outgoing calls.
+ }
+
+ @Override
public void disallowCall(String s, boolean b, boolean b1, boolean b2,
ComponentName componentName) throws RemoteException {
// no-op; we don't allow this on outgoing calls.
diff --git a/src/com/android/server/telecom/InCallAdapter.java b/src/com/android/server/telecom/InCallAdapter.java
index 8de27be..888010d 100644
--- a/src/com/android/server/telecom/InCallAdapter.java
+++ b/src/com/android/server/telecom/InCallAdapter.java
@@ -19,6 +19,7 @@
import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
+import android.os.RemoteException;
import android.telecom.Log;
import android.telecom.PhoneAccountHandle;
@@ -319,6 +320,16 @@
}
@Override
+ public void enterBackgroundAudioProcessing(String callId) {
+ // TODO: implement this
+ }
+
+ @Override
+ public void exitBackgroundAudioProcessing(String callId, boolean shouldRing) {
+ // TODO: implement this
+ }
+
+ @Override
public void conference(String callId, String otherCallId) {
try {
Log.startSession(LogUtils.Sessions.ICA_CONFERENCE, mOwnerComponentName);
diff --git a/src/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java b/src/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
index c8ec18a..2a0e338 100644
--- a/src/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
+++ b/src/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
@@ -177,6 +177,11 @@
Log.endSession();
}
}
+
+ @Override
+ public void screenCallFurther(String callId) {
+ // TODO: implement this
+ }
}
private final Context mContext;