diff options
| author | 2017-01-10 22:02:12 +0000 | |
|---|---|---|
| committer | 2017-01-10 22:02:15 +0000 | |
| commit | bbdcc9305a726c8549b950a3c32fa571a15aa541 (patch) | |
| tree | fa87ceed9664361d1e59db2b4a49edee06ebfa5d | |
| parent | f5393c8a50c85f86e12d9a388fe3d4ced1f3eeb9 (diff) | |
| parent | 4af561ff17b82a32580d3c1bd8b91be12f25b7fd (diff) | |
Merge "Adding extra key to indicate when the last emergency call was made."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Call.java | 7 |
4 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index a4402bb7987e..b125d1e116da 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/api/system-current.txt b/api/system-current.txt index 2ec564302d8c..ff37b5b2552c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 diff --git a/api/test-current.txt b/api/test-current.txt index 7e05b785524e..1f5918561f53 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index c69b7c2771ac..b20384dfffbc 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -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. */ |