summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorShriram Ganesh <sganesh@codeaurora.org>2015-05-31 09:18:48 -0700
committerEtan Cohen <etancohen@google.com>2015-07-06 11:28:19 -0700
commitddf570e8226bd21448b44b3327d4bcb2608f4d00 (patch)
tree867279fea4ecc997919a3717eecd18136a1e5265 /telecomm
parentb304fc0aafe067e422ce219ba5edb4bc7a68924c (diff)
downloadframeworks_base-ddf570e8226bd21448b44b3327d4bcb2608f4d00.zip
frameworks_base-ddf570e8226bd21448b44b3327d4bcb2608f4d00.tar.gz
frameworks_base-ddf570e8226bd21448b44b3327d4bcb2608f4d00.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 8. - Propagate IMS supplementary services to telephony framework - Introduce call forwarding history info. Bug: 21725750 Squash of 2 earlier CLs: Change-Id: I52a64e9a5df3479189f62921a01655a50fb386fc Change-Id: Idc3a433785e84a3d683cbcfc7fb90f0b89dced12 Change-Id: I428ce3c6a043e43b86dea41622e0a828d8b45e53
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecom/Call.java9
-rw-r--r--telecomm/java/android/telecom/Connection.java7
-rw-r--r--telecomm/java/android/telecom/Phone.java3
3 files changed, 17 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index e756a57..6c1c118 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -968,7 +968,6 @@ public final class Call {
unregisterCallback(listener);
}
-
/** {@hide} */
Call(Phone phone, String telecomCallId, InCallAdapter inCallAdapter) {
mPhone = phone;
@@ -978,6 +977,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/Connection.java b/telecomm/java/android/telecom/Connection.java
index f304d1d..93cea97 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -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);
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);