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

Commit 1bfabc74 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'merge-dr1-063015' into mnc-dr-dev 

* changes:
  Added support for mid-call enabled SRVCC conference call
  MWI,phantom call,Suppl services, error codes
  Rename VoLTE/WFC enable API to available - add VT available API.
parents 593904b1 6bf35acd

telecomm/java/android/telecom/Call.java

+8 −1
Original line number Diff line number Diff line
@@ -968,7 +968,6 @@ public final class Call { 
        unregisterCallback(listener);

    }





    /** {@hide} */

    Call(Phone phone, String telecomCallId, InCallAdapter inCallAdapter) {

        mPhone = phone;
@@ -977,6 +976,14 @@ public final class Call { 
        mState = STATE_NEW;

    }



    /** {@hide} */

    Call(Phone phone, String telecomCallId, InCallAdapter inCallAdapter, int state) {

        mPhone = phone;

        mTelecomCallId = telecomCallId;

        mInCallAdapter = inCallAdapter;

        mState = state;

    }



    /** {@hide} */

    final String internalGetCallId() {

        return mTelecomCallId;

telecomm/java/android/telecom/Connection.java

+7 −0
Original line number Diff line number Diff line
@@ -252,6 +252,13 @@ public abstract class Connection extends Conferenceable { 
    // Next CAPABILITY value: 0x00400000

    //**********************************************************************************************



    /**

     * Call extras key to pack/unpack call history info.

     * The value for this key should be an ArrayList of Strings.

     * @hide

     */

    public static final String EXTRA_CALL_HISTORY_INFO = "EXTRA_CALL_HISTORY_INFO";



    // Flag controlling whether PII is emitted into the logs

    private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);

telecomm/java/android/telecom/ConnectionService.java

+13 −0
Original line number Diff line number Diff line
@@ -655,6 +655,9 @@ public abstract class ConnectionService extends Service { 
                        connection.getDisconnectCause(),

                        createIdList(connection.getConferenceables()),

                        connection.getExtras()));

        if (isUnknown) {

            triggerConferenceRecalculate();

        }

    }



    private void abort(String callId) {
@@ -1013,6 +1016,16 @@ public abstract class ConnectionService extends Service { 
        return null;

    }



    /**

     * Trigger recalculate functinality for conference calls. This is used when a Telephony

     * Connection is part of a conference controller but is not yet added to Connection

     * Service and hence cannot be added to the conference call.

     *

     * @hide

     */

    public void triggerConferenceRecalculate() {

    }



    /**

     * Create a {@code Connection} given an outgoing request. This is used to initiate new

     * outgoing calls.

telecomm/java/android/telecom/Phone.java

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ public final class Phone { 
    }



    final void internalAddCall(ParcelableCall parcelableCall) {

        Call call = new Call(this, parcelableCall.getId(), mInCallAdapter);

        Call call = new Call(this, parcelableCall.getId(), mInCallAdapter,

                parcelableCall.getState());

        mCallByTelecomCallId.put(parcelableCall.getId(), call);

        mCalls.add(call);

        checkCallTree(parcelableCall);

telephony/java/android/telephony/TelephonyManager.java

+26 −12
Original line number Diff line number Diff line
@@ -4289,9 +4289,23 @@ public class TelephonyManager { 
     * Returns the Status of Volte

     * @hide

     */

   public boolean isVolteEnabled() {

    public boolean isVolteAvailable() {

       try {

           return getITelephony().isVolteEnabled();

           return getITelephony().isVolteAvailable();

       } catch (RemoteException ex) {

           return false;

       } catch (NullPointerException ex) {

           return false;

       }

   }



    /**

     * Returns the Status of video telephony (VT)

     * @hide

     */

    public boolean isVideoTelephonyAvailable() {

        try {

            return getITelephony().isVideoTelephonyAvailable();

        } catch (RemoteException ex) {

            return false;

        } catch (NullPointerException ex) {
@@ -4303,9 +4317,9 @@ public class TelephonyManager { 
     * Returns the Status of Wi-Fi Calling

     * @hide

     */

   public boolean isWifiCallingEnabled() {

    public boolean isWifiCallingAvailable() {

       try {

           return getITelephony().isWifiCallingEnabled();

           return getITelephony().isWifiCallingAvailable();

       } catch (RemoteException ex) {

           return false;

       } catch (NullPointerException ex) {