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

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

Merge "IMS: Changes for VICE FR"

parents cfe0d38f 951e5890

telephony/java/com/android/ims/ImsCallProfile.java

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ public class ImsCallProfile implements Parcelable { 
    public static final String EXTRA_CODEC = "Codec";

    public static final String EXTRA_DISPLAY_TEXT = "DisplayText";

    public static final String EXTRA_ADDITIONAL_CALL_INFO = "AdditionalCallInfo";

    public static final String EXTRA_IS_CALL_PULL = "CallPull";



    public int mServiceType;

    public int mCallType;

telephony/java/com/android/ims/ImsReasonInfo.java

+10 −0
Original line number Diff line number Diff line
@@ -240,6 +240,16 @@ public class ImsReasonInfo implements Parcelable { 
     */

    public static final int CODE_ANSWERED_ELSEWHERE = 1014;



    /**

     * For VICE - Call Pull request has failed

     */

    public static final int CODE_CALL_PULL_OUT_OF_SYNC = 1015;



    /**

     * For VICE - Call has been pulled from primary to secondary

     */

    public static final int CODE_CALL_END_CAUSE_CALL_PULL = 1016;



    /**

     * Network string error messages.

     * mExtraMessage may have these values.

telephony/java/com/android/internal/telephony/TelephonyProperties.java

+9 −0
Original line number Diff line number Diff line
@@ -248,4 +248,13 @@ public interface TelephonyProperties 
     * if false: normal dial

     */

    static final String ADD_PARTICIPANT_KEY = "add_participant";



    /**

     * For VICE Feature

     * If true: Dial intent is for call pull functionality

     * if false: normal dial

     */

    static final String EXTRA_IS_CALL_PULL =

            "org.codeaurora.extra.IS_CALL_PULL";



}