Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify AIDLs to include Session.Info

Browse Source 
am: b32d4f8b5c

Change-Id: Ibbac4c74b5a0c4fcd5524c97acef5fc078d80cb7
This commit is contained in:
Brad Ebinger
2016-10-28 20:17:03 +00:00
committed by android-build-merger
parent 4aa38633fe b32d4f8b5c
commit 668a6fa227
10 changed files with 573 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
telecomm/java/android/telecom/RemoteConference.java
View File

@@ -399,7 +399,7 @@ public final class RemoteConference {
*/
public void disconnect() {
try {
mConnectionService.disconnect(mId);
mConnectionService.disconnect(mId, null /*Session.Info*/);
} catch (RemoteException e) {
}
}
@@ -414,7 +414,7 @@ public final class RemoteConference {
public void separate(RemoteConnection connection) {
if (mChildConnections.contains(connection)) {
try {
mConnectionService.splitFromConference(connection.getId());
mConnectionService.splitFromConference(connection.getId(), null /*Session.Info*/);
} catch (RemoteException e) {
}
}
@@ -432,7 +432,7 @@ public final class RemoteConference {
*/
public void merge() {
try {
mConnectionService.mergeConference(mId);
mConnectionService.mergeConference(mId, null /*Session.Info*/);
} catch (RemoteException e) {
}
}
@@ -448,7 +448,7 @@ public final class RemoteConference {
*/
public void swap() {
try {
mConnectionService.swapConference(mId);
mConnectionService.swapConference(mId, null /*Session.Info*/);
} catch (RemoteException e) {
}
}
@@ -458,7 +458,7 @@ public final class RemoteConference {
*/
public void hold() {
try {
mConnectionService.hold(mId);
mConnectionService.hold(mId, null /*Session.Info*/);
} catch (RemoteException e) {
}
}
@@ -468,7 +468,7 @@ public final class RemoteConference {
*/
public void unhold() {
try {
mConnectionService.unhold(mId);
mConnectionService.unhold(mId, null /*Session.Info*/);
} catch (RemoteException e) {
}
}
@@ -491,7 +491,7 @@ public final class RemoteConference {
*/
public void playDtmfTone(char digit) {
try {
mConnectionService.playDtmfTone(mId, digit);
mConnectionService.playDtmfTone(mId, digit, null /*Session.Info*/);
} catch (RemoteException e) {
}
}
@@ -503,7 +503,7 @@ public final class RemoteConference {
*/
public void stopDtmfTone() {
try {
mConnectionService.stopDtmfTone(mId);
mConnectionService.stopDtmfTone(mId, null /*Session.Info*/);
} catch (RemoteException e) {
}
}
@@ -528,7 +528,7 @@ public final class RemoteConference {
*/
public void setCallAudioState(CallAudioState state) {
try {
mConnectionService.onCallAudioStateChanged(mId, state);
mConnectionService.onCallAudioStateChanged(mId, state, null /*Session.Info*/);
} catch (RemoteException e) {
}
}