diff options
| author | Hall Liu <hallliu@google.com> | 2020-10-22 23:04:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-22 23:04:01 +0000 |
| commit | c155bb62a167356cc089481ff8314ae78432fea6 (patch) | |
| tree | 6ce56c0362ec56c57f6096837b5af161ae808798 /api | |
| parent | f86143770fdeba9a8b70b54e9710933a11a47f2a (diff) | |
| parent | 2cf63f72cde7b2fbb57c6e5f59016bc8bd62ed64 (diff) | |
Merge changes from topic "mainline-telecom-constants"
* changes:
Update documentation for phone account sort order
API tweaks in response to feedback
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rwxr-xr-x | api/system-current.txt | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index b251612cbfdf..99d59d224945 100644 --- a/api/current.txt +++ b/api/current.txt @@ -45977,6 +45977,7 @@ package android.telecom { field public static final int MISSED = 5; // 0x5 field public static final int OTHER = 9; // 0x9 field public static final String REASON_EMERGENCY_CALL_PLACED = "REASON_EMERGENCY_CALL_PLACED"; + field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL"; field public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED"; field public static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF"; field public static final int REJECTED = 6; // 0x6 diff --git a/api/system-current.txt b/api/system-current.txt index 98560e0cc6fd..68a4f340fb20 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10270,10 +10270,6 @@ package android.telecom { method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference); } - public final class DisconnectCause implements android.os.Parcelable { - field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL"; - } - public abstract class InCallService extends android.app.Service { method @Deprecated public android.telecom.Phone getPhone(); method @Deprecated public void onPhoneCreated(android.telecom.Phone); |