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

Commit 61952e69 authored by Uma Maheswari Ramalingam's avatar Uma Maheswari Ramalingam Committed by Tyler Gunn
Browse files

IMS: Conference fixes 

- Add IMS Conference Participant API

Change-Id: I5f9829926beeb468cd4979db55a07e1cd3dd1c30
Bug: 21376607
parent a727251a

src/java/com/android/internal/telephony/Call.java

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.internal.telephony;



import android.telecom.ConferenceParticipant;



import java.util.ArrayList;

import java.util.List;
@@ -120,6 +122,14 @@ public abstract class Call { 
        return mState;

    }



    /**

     * getConferenceParticipants

     * @return List of conference participants.

     */

    public List<ConferenceParticipant> getConferenceParticipants() {

        return null;

    }



    /**

     * isIdle

     *

src/java/com/android/internal/telephony/Connection.java

+16 −0
Original line number Diff line number Diff line
@@ -291,6 +291,22 @@ public abstract class Connection { 
        return mPreHandoverState;

    }



    /**

     * Get the details of conference participants. Expected to be

     * overwritten by the Connection subclasses.

     */

    public List<ConferenceParticipant> getConferenceParticipants() {

        Call c;



        c = getCall();



        if (c == null) {

            return null;

        } else {

            return c.getConferenceParticipants();

        }

    }



    /**

     * isAlive()

     *

src/java/com/android/internal/telephony/imsphone/ImsPhoneCall.java

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.internal.telephony.imsphone;



import android.telecom.ConferenceParticipant;

import android.telephony.Rlog;

import android.telephony.DisconnectCause;
@@ -106,6 +107,15 @@ public class ImsPhoneCall extends Call { 
        return mState.toString();

    }



    @Override

    public List<ConferenceParticipant> getConferenceParticipants() {

         ImsCall call = getImsCall();

         if (call == null) {

             return null;

         }

         return call.getConferenceParticipants();

    }



    //***** Called from ImsPhoneConnection



    /*package*/ void