summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorOmkar Kolangade <omkark@codeaurora.org>2015-01-30 14:59:11 -0800
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:26:48 -0600
commitcf5a398354864e4c1b0665f8ba7d7d008e433a7f (patch)
treea3b85008b4dfd05bda6dc2bfb73c51115dafc515 /telecomm
parenteb1e4d4b05b04764f99afa21303ff6985fb825f6 (diff)
downloadframeworks_base-cf5a398354864e4c1b0665f8ba7d7d008e433a7f.zip
frameworks_base-cf5a398354864e4c1b0665f8ba7d7d008e433a7f.tar.gz
frameworks_base-cf5a398354864e4c1b0665f8ba7d7d008e433a7f.tar.bz2
IMS: Supplementary services
- Propagate IMS supplementary services to telephony framework - Introduce call forwarding history info. Conflicts: telecomm/java/android/telecom/Connection.java Bug: 21725750 Change-Id: Idc3a433785e84a3d683cbcfc7fb90f0b89dced12
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecom/Connection.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 7b277c5..df69f23 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -275,6 +275,13 @@ public abstract class Connection extends Conferenceable {
*/
public static final String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
+ /**
+ * 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);