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

Commit 976fea98 authored by Andrew Lee's avatar Andrew Lee Committed by Android Git Automerger
Browse files

am c3c238a3: Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev 

* commit 'c3c238a3':
  Properly convert GENERIC_CONFERENCE capabilities.
parents ffce0588 c3c238a3

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

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


        Connection.CAPABILITY_DISCONNECT_FROM_CONFERENCE,

        android.telecom.Call.Details.CAPABILITY_DISCONNECT_FROM_CONFERENCE,



        Connection.CAPABILITY_GENERIC_CONFERENCE,

        android.telecom.Call.Details.CAPABILITY_GENERIC_CONFERENCE

    };



    private static int convertConnectionToCallCapabilities(int connectionCapabilities) {