diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-24 20:33:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-24 20:33:33 -0700 |
| commit | 25ded1d77bc34a736252c728e62e1d4e0eb0b9c5 (patch) | |
| tree | 2c7821516c18c8b2330495619ea67fc215e6a58f /telephony/java/com | |
| parent | cfe0d38f0f3b11b712d8eef73c07e5f6e87142cc (diff) | |
| parent | 951e58904fd0a539221ff853774d5a97b0f0b3e9 (diff) | |
| download | frameworks_base-25ded1d77bc34a736252c728e62e1d4e0eb0b9c5.zip frameworks_base-25ded1d77bc34a736252c728e62e1d4e0eb0b9c5.tar.gz frameworks_base-25ded1d77bc34a736252c728e62e1d4e0eb0b9c5.tar.bz2 | |
Merge "IMS: Changes for VICE FR"
Diffstat (limited to 'telephony/java/com')
3 files changed, 20 insertions, 0 deletions
diff --git a/telephony/java/com/android/ims/ImsCallProfile.java b/telephony/java/com/android/ims/ImsCallProfile.java index f263b4d..d73b2bd 100644 --- a/telephony/java/com/android/ims/ImsCallProfile.java +++ b/telephony/java/com/android/ims/ImsCallProfile.java @@ -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; diff --git a/telephony/java/com/android/ims/ImsReasonInfo.java b/telephony/java/com/android/ims/ImsReasonInfo.java index 0244209..3ab415c 100644 --- a/telephony/java/com/android/ims/ImsReasonInfo.java +++ b/telephony/java/com/android/ims/ImsReasonInfo.java @@ -241,6 +241,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. */ diff --git a/telephony/java/com/android/internal/telephony/TelephonyProperties.java b/telephony/java/com/android/internal/telephony/TelephonyProperties.java index 1d142e7..f2cc775 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyProperties.java +++ b/telephony/java/com/android/internal/telephony/TelephonyProperties.java @@ -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"; + } |