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

Merge "Add missing methods to Conference object" into lmp-dev

Browse Source
This commit is contained in:
Yorke Lee
2014-09-17 03:29:11 +00:00
committed by Android (Google) Code Review
parent ebc69cd19e a0d3ca9746
commit 1c4eb10cc1
3 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -607,17 +607,29 @@ public abstract class ConnectionService extends Service {
private void onAudioStateChanged(String callId, AudioState audioState) {
Log.d(this, "onAudioStateChanged %s %s", callId, audioState);
findConnectionForAction(callId, "onAudioStateChanged").setAudioState(audioState);
if (mConnectionById.containsKey(callId)) {
findConnectionForAction(callId, "onAudioStateChanged").setAudioState(audioState);
} else {
findConferenceForAction(callId, "onAudioStateChanged").setAudioState(audioState);
}
}
private void playDtmfTone(String callId, char digit) {
Log.d(this, "playDtmfTone %s %c", callId, digit);
findConnectionForAction(callId, "playDtmfTone").onPlayDtmfTone(digit);
if (mConnectionById.containsKey(callId)) {
findConnectionForAction(callId, "playDtmfTone").onPlayDtmfTone(digit);
} else {
findConferenceForAction(callId, "playDtmfTone").onPlayDtmfTone(digit);
}
}
private void stopDtmfTone(String callId) {
Log.d(this, "stopDtmfTone %s", callId);
findConnectionForAction(callId, "stopDtmfTone").onStopDtmfTone();
if (mConnectionById.containsKey(callId)) {
findConnectionForAction(callId, "stopDtmfTone").onStopDtmfTone();
} else {
findConferenceForAction(callId, "stopDtmfTone").onStopDtmfTone();
}
}
private void conference(String callId1, String callId2) {