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

Commit fe457662 authored Sep 26, 2014 by Sailesh Nepal Committed by Android Git Automerger Sep 26, 2014

am 848718a0: am 5926650d: am 7461b5a0: Merge "Adding support for Cdma...

am 848718a0: am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev

* commit '848718a04e7e50402c7c2f10718d1a7e19cf9956':
  Adding support for Cdma conference calling.

parents 3481fd95 faed92cd

telecomm/java/android/telecom/RemoteConference.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,20 @@ public final class RemoteConference {
		}
		}

		public void merge() {
		try {
		mConnectionService.mergeConference(mId);
		} catch (RemoteException e) {
		}
		}

		public void swap() {
		try {
		mConnectionService.swapConference(mId);
		} catch (RemoteException e) {
		}
		}

		public void hold() {
		try {
		mConnectionService.hold(mId);