summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-07-24 10:53:25 -0700
committerTyler Gunn <tgunn@google.com>2015-07-24 10:53:25 -0700
commit0072090230ff9110fbb1c6f71cc535430e46b51d (patch)
tree199dde2cb536ab98c2d128340204c89fd8a584d8 /telecomm
parentb020b0d97d80f0ebb550ce58a5b36787cfcf6df8 (diff)
downloadframeworks_base-0072090230ff9110fbb1c6f71cc535430e46b51d.zip
frameworks_base-0072090230ff9110fbb1c6f71cc535430e46b51d.tar.gz
frameworks_base-0072090230ff9110fbb1c6f71cc535430e46b51d.tar.bz2
Add child_address call extra.
Used to pass the child number up from IMS to InCall via extras. Bug: 22685113 Change-Id: I8990e4e74be5052f5ff840f8277abd2df1cb4c9d
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecom/Connection.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 2ab6d56..26477ce 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -257,7 +257,16 @@ public abstract class Connection extends Conferenceable {
* The value for this key should be an ArrayList of Strings.
* @hide
*/
- public static final String EXTRA_CALL_HISTORY_INFO = "EXTRA_CALL_HISTORY_INFO";
+ public static final String EXTRA_CALL_HISTORY_INFO = "android.telecom.EXTRA_CALL_HISTORY_INFO";
+
+ /**
+ * Connection {@link #mExtras} key used to store a child number associated with the current
+ * connection. Used to communicate to the user interface that the connection was received via
+ * a child address (in telephony phone number) associated with the {@link PhoneAccount}'s
+ * primary address.
+ * @hide
+ */
+ public static final String EXTRA_CHILD_ADDRESS = "android.telecom.EXTRA_CHILD_ADDRESS";
// Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);