diff options
| author | Andrew Lee <anwlee@google.com> | 2015-02-19 21:27:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-19 21:27:08 +0000 |
| commit | 7870433c65daed452c57c6db4404036c2c4548b6 (patch) | |
| tree | 15f14fbb0a60e199b5cc5736b13aab2d33cbefff /api | |
| parent | 56725501fed930374f8d3b113df5c8941a2a2664 (diff) | |
| parent | 866080f28a8f3f42e1462c98885c1495117e65ab (diff) | |
| download | frameworks_base-7870433c65daed452c57c6db4404036c2c4548b6.zip frameworks_base-7870433c65daed452c57c6db4404036c2c4548b6.tar.gz frameworks_base-7870433c65daed452c57c6db4404036c2c4548b6.tar.bz2 | |
Merge "Add intent for configuring RespondViaSms."
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 cd74fe5..a1cdc8d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28747,6 +28747,7 @@ package android.telecom { method public boolean isInCall(); method public void showInCallScreen(boolean); field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS"; + field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS"; field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ',' field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';' field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE"; diff --git a/api/system-current.txt b/api/system-current.txt index b016a96..13a8981 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30867,6 +30867,7 @@ package android.telecom { field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS"; field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE"; field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS"; + field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS"; field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ',' field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';' field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER"; |