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

Commit b489294f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Properly convert GENERIC_CONFERENCE capabilities."

parents 5e2e25c0 4508c231

src/com/android/server/telecom/InCallController.java

+3 −0
Original line number Diff line number Diff line
@@ -589,6 +589,9 @@ public final class InCallController extends CallsManagerListenerBase { 


        Connection.ADD_PARTICIPANT,

        android.telecom.Call.Details.ADD_PARTICIPANT,



        Connection.CAPABILITY_GENERIC_CONFERENCE,

        android.telecom.Call.Details.CAPABILITY_GENERIC_CONFERENCE

    };



    private static int convertConnectionToCallCapabilities(int connectionCapabilities) {