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

am 234a4597: am 587e65b1: am 848718a0: am 5926650d: am 7461b5a0: Merge "Adding...

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

* commit '234a45977925fdaf20aa7a3b333f551350049ae8':
  Adding support for Cdma conference calling.

parents ab83c042 e1a67e6f

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