Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908

Change-Id: I49034d851b111792fa54b3d2f236d56513bb00f9
This commit is contained in:
Grace Jia
2020-08-13 18:46:06 +00:00
committed by Automerger Merge Worker
7 changed files with 149 additions and 7 deletions

View File

@@ -16,10 +16,6 @@
package android.telecom;
import com.android.internal.telecom.IConnectionService;
import com.android.internal.telecom.IVideoCallback;
import com.android.internal.telecom.IVideoProvider;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
@@ -33,6 +29,10 @@ import android.os.RemoteException;
import android.telecom.Logging.Session;
import android.view.Surface;
import com.android.internal.telecom.IConnectionService;
import com.android.internal.telecom.IVideoCallback;
import com.android.internal.telecom.IVideoProvider;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -1113,6 +1113,23 @@ public final class RemoteConnection {
}
}
/**
* Instructs this {@link RemoteConnection} to initiate a conference with a list of
* participants.
* <p>
*
* @param participants with which conference call will be formed.
*/
public void addConferenceParticipants(@NonNull List<Uri> participants) {
try {
if (mConnected) {
mConnectionService.addConferenceParticipants(mConnectionId, participants,
null /*Session.Info*/);
}
} catch (RemoteException ignored) {
}
}
/**
* Set the audio state of this {@code RemoteConnection}.
*