summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorShriram Ganesh <sganesh@codeaurora.org>2015-05-31 09:18:48 -0700
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:26:19 -0600
commitcee35a57a9049cf253b7523f9bfd9b2d48547871 (patch)
tree704a28bdb0d0a7c5bb13fe6b10a86b17cc177561 /telecomm
parent8c0bc4c99c9416ea734d01cc3ffbb09eb3540937 (diff)
downloadframeworks_base-cee35a57a9049cf253b7523f9bfd9b2d48547871.zip
frameworks_base-cee35a57a9049cf253b7523f9bfd9b2d48547871.tar.gz
frameworks_base-cee35a57a9049cf253b7523f9bfd9b2d48547871.tar.bz2
MWI,phantom call,Suppl services, error codes
1. IMS MWI Feature - Add new API to update waiting voice message count, for UI propagation based on RFC 3842 2. phantom call support Supplementary services 3. IMS : Incoming Call Barring - Modified existing API to support request like registration,activation, deactivation,erasure,interogation. 4.Unsol supplementary service notification - send unsol supplementary notification to UI - add call history info Miscellaneous 5. Ims: Originate conference call in DIALING state 6. IMS: Addition of Extras to ImsCallProfile - Add EXTRA string definitions to ImsCallProfile 7. IMS: Definition of error code - answered elsewhere - FDN call failure Change-Id: I52a64e9a5df3479189f62921a01655a50fb386fc
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecom/Call.java9
-rw-r--r--telecomm/java/android/telecom/Phone.java3
2 files changed, 10 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index 0a1dbf6..f149f24 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -970,7 +970,6 @@ public final class Call {
unregisterCallback(listener);
}
-
/** {@hide} */
Call(Phone phone, String telecomCallId, InCallAdapter inCallAdapter) {
mPhone = phone;
@@ -980,6 +979,14 @@ public final class Call {
}
/** {@hide} */
+ Call(Phone phone, String telecomCallId, InCallAdapter inCallAdapter, int state) {
+ mPhone = phone;
+ mTelecomCallId = telecomCallId;
+ mInCallAdapter = inCallAdapter;
+ mState = state;
+ }
+
+ /** {@hide} */
final String internalGetCallId() {
return mTelecomCallId;
}
diff --git a/telecomm/java/android/telecom/Phone.java b/telecomm/java/android/telecom/Phone.java
index 8eb091b..47154da 100644
--- a/telecomm/java/android/telecom/Phone.java
+++ b/telecomm/java/android/telecom/Phone.java
@@ -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);