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

Commit 2ef34be6 authored by Ihab Awad's avatar Ihab Awad
Browse files

Change UI to represent conferenced IMS connections (1/3) 

IMS conferenced connnections cannot individually hold or disconnect.

Bug: 17451623
Change-Id: Ie945d2c23f752f5403d01668606fe893dca0a882
parent db352c78

api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -28377,12 +28377,14 @@ package android.telecomm { 
  public final class PhoneCapabilities {

    method public static java.lang.String toString(int);

    field public static final int ADD_CALL = 16; // 0x10

    field public static final int ALL = 255; // 0xff

    field public static final int ALL = 12543; // 0x30ff

    field public static final int DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000

    field public static final int HOLD = 1; // 0x1

    field public static final int MANAGE_CONFERENCE = 128; // 0x80

    field public static final int MERGE_CONFERENCE = 4; // 0x4

    field public static final int MUTE = 64; // 0x40

    field public static final int RESPOND_VIA_TEXT = 32; // 0x20

    field public static final int SEPARATE_FROM_CONFERENCE = 4096; // 0x1000

    field public static final int SUPPORT_HOLD = 2; // 0x2

    field public static final int SWAP_CONFERENCE = 8; // 0x8

  }

telecomm/java/android/telecomm/PhoneCapabilities.java

+13 −2
Original line number Diff line number Diff line
@@ -78,8 +78,19 @@ public final class PhoneCapabilities { 
     */

    public static final int VoWIFI = 0x00000800;



    public static final int ALL = HOLD | SUPPORT_HOLD | MERGE_CONFERENCE | SWAP_CONFERENCE | ADD_CALL

            | RESPOND_VIA_TEXT | MUTE | MANAGE_CONFERENCE;

    /**

     * Call is able to be separated from its parent {@code Conference}, if any.

     */

    public static final int SEPARATE_FROM_CONFERENCE = 0x00001000;



    /**

     * Call is able to be individually disconnected when in a {@code Conference}.

     */

    public static final int DISCONNECT_FROM_CONFERENCE = 0x00002000;



    public static final int ALL = HOLD | SUPPORT_HOLD | MERGE_CONFERENCE | SWAP_CONFERENCE

            | ADD_CALL | RESPOND_VIA_TEXT | MUTE | MANAGE_CONFERENCE | SEPARATE_FROM_CONFERENCE

            | DISCONNECT_FROM_CONFERENCE;



    public static String toString(int capabilities) {

        StringBuilder builder = new StringBuilder();