diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-07-28 20:07:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 20:07:40 +0000 |
| commit | bdbec480e8598bd959a2fc047cfad8b72c8a645b (patch) | |
| tree | e962a5a2852063e16d4111f75c4c4c4bc105d1a7 /api | |
| parent | 3551a59b277fd4dc924f48116c153a50fb0913eb (diff) | |
| parent | 65a3d3430aa0b32ec44092becc18cb68feea6b61 (diff) | |
| download | frameworks_base-bdbec480e8598bd959a2fc047cfad8b72c8a645b.zip frameworks_base-bdbec480e8598bd959a2fc047cfad8b72c8a645b.tar.gz frameworks_base-bdbec480e8598bd959a2fc047cfad8b72c8a645b.tar.bz2 | |
Merge "Add "Call subject" capability to phone accounts." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 23c05dc..06b9494 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30288,6 +30288,7 @@ package android.telecom { method public android.telecom.PhoneAccount.Builder toBuilder(); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2 + field public static final int CAPABILITY_CALL_SUBJECT = 64; // 0x40 field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1 field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10 field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4 diff --git a/api/system-current.txt b/api/system-current.txt index 505802d..83c3beb 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32496,6 +32496,7 @@ package android.telecom { method public android.telecom.PhoneAccount.Builder toBuilder(); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2 + field public static final int CAPABILITY_CALL_SUBJECT = 64; // 0x40 field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1 field public static final int CAPABILITY_MULTI_USER = 32; // 0x20 field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10 |