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

Commit bbdcc930 authored by Michael Dooley's avatar Michael Dooley Committed by Android (Google) Code Review
Browse files

Merge "Adding extra key to indicate when the last emergency call was made."

parents f5393c8a 4af561ff

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36726,6 +36726,7 @@ package android.telecom { 
    method public void unhold();

    method public void unregisterCallback(android.telecom.Call.Callback);

    field public static final java.lang.String AVAILABLE_PHONE_ACCOUNTS = "selectPhoneAccountAccounts";

    field public static final java.lang.String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS = "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS";

    field public static final int STATE_ACTIVE = 4; // 0x4

    field public static final int STATE_CONNECTING = 9; // 0x9

    field public static final int STATE_DIALING = 1; // 0x1

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39660,6 +39660,7 @@ package android.telecom { 
    method public void unhold();

    method public void unregisterCallback(android.telecom.Call.Callback);

    field public static final java.lang.String AVAILABLE_PHONE_ACCOUNTS = "selectPhoneAccountAccounts";

    field public static final java.lang.String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS = "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS";

    field public static final int STATE_ACTIVE = 4; // 0x4

    field public static final int STATE_CONNECTING = 9; // 0x9

    field public static final int STATE_DIALING = 1; // 0x1

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36844,6 +36844,7 @@ package android.telecom { 
    method public void unhold();

    method public void unregisterCallback(android.telecom.Call.Callback);

    field public static final java.lang.String AVAILABLE_PHONE_ACCOUNTS = "selectPhoneAccountAccounts";

    field public static final java.lang.String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS = "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS";

    field public static final int STATE_ACTIVE = 4; // 0x4

    field public static final int STATE_CONNECTING = 9; // 0x9

    field public static final int STATE_DIALING = 1; // 0x1

telecomm/java/android/telecom/Call.java

+7 −0
Original line number Diff line number Diff line
@@ -115,6 +115,13 @@ public final class Call { 
     */

    public static final String AVAILABLE_PHONE_ACCOUNTS = "selectPhoneAccountAccounts";



    /**

     * Extra key used to indicate the time (in millis) when the last outgoing emergency call was

     * made.  This is used to identify potential emergency callbacks.

     */

    public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS =

            "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS";



    public static class Details {



        /** Call can currently be put on hold or unheld. */