Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4fe26eb authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Git Automerger
Browse files

am 91aa02f2: am baca9e1e: am 0be28a7f: am c5c7987f: Merge "Add child_address... 

am 91aa02f2: am baca9e1e: am 0be28a7f: am c5c7987f: Merge "Add child_address call extra." into mnc-dr-dev

* commit '91aa02f2':
  Add child_address call extra.
parents a3849e82 91aa02f2

telecomm/java/android/telecom/Connection.java

+10 −1
Original line number Diff line number Diff line
@@ -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);