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

Merge "Merge "Ensure self-managed calls use voip audio mode." am: b62aa315d1 am: fd3e10b1bc" into pi-dev-plus-aosp

Browse Source 
am: 6823c8a822

Change-Id: I1352a44cbb55fdeeb79771b27055a70b83a3cbb8
This commit is contained in:
Tyler Gunn
2018-06-06 18:08:05 -07:00
committed by android-build-merger
parent b4411d65ee 6823c8a822
commit 3193b1537c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1531,6 +1531,14 @@ public abstract class ConnectionService extends Service {
new DisconnectCause(DisconnectCause.ERROR, "IMPL_RETURNED_NULL_CONNECTION"));
}
boolean isSelfManaged =
(connection.getConnectionProperties() & Connection.PROPERTY_SELF_MANAGED)
== Connection.PROPERTY_SELF_MANAGED;
// Self-managed Connections should always use voip audio mode; we default here so that the
// local state within the ConnectionService matches the default we assume in Telecom.
if (isSelfManaged) {
connection.setAudioModeIsVoip(true);
}
connection.setTelecomCallId(callId);
if (connection.getState() != Connection.STATE_DISCONNECTED) {
addConnection(request.getAccountHandle(), callId, connection);
@@ -1570,9 +1578,7 @@ public abstract class ConnectionService extends Service {
createIdList(connection.getConferenceables()),
connection.getExtras()));
if (isIncoming && request.shouldShowIncomingCallUi() &&
(connection.getConnectionProperties() & Connection.PROPERTY_SELF_MANAGED) ==
Connection.PROPERTY_SELF_MANAGED) {
if (isIncoming && request.shouldShowIncomingCallUi() && isSelfManaged) {
// Tell ConnectionService to show its incoming call UX.
connection.onShowIncomingCallUi();
}