Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add child_address call extra." into mnc-dr-dev

Browse Source
This commit is contained in:
Tyler Gunn
2015-07-28 15:07:03 +00:00
committed by Android (Google) Code Review
parent 3209e18ce0 0072090230
commit c5c7987fea
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telecomm/java/android/telecom/Connection.java
View File

@@ -257,7 +257,16 @@ public abstract class Connection extends Conferenceable {
* The value for this key should be an ArrayList of Strings. * The value for this key should be an ArrayList of Strings.
* @hide * @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 // Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG); private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);