diff options
| author | Santos Cordon <santoscordon@google.com> | 2015-06-29 23:40:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 23:40:24 +0000 |
| commit | bea55afc4a5af9564ff175091d5b3b8736f70a7c (patch) | |
| tree | c9c32a9ae61d561304db51a4dc6ab992a39e8fee /api | |
| parent | f7c5c373ab08bbd5aade14c4a94c4457558deb95 (diff) | |
| parent | 895d4b8f63389b79974dfd3e36f1ab10b5ceb4dc (diff) | |
| download | frameworks_base-bea55afc4a5af9564ff175091d5b3b8736f70a7c.zip frameworks_base-bea55afc4a5af9564ff175091d5b3b8736f70a7c.tar.gz frameworks_base-bea55afc4a5af9564ff175091d5b3b8736f70a7c.tar.bz2 | |
Merge "Telecom API council changes." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index aae84e1..2321d72 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30450,7 +30450,7 @@ package android.telecom { method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle); field public static final java.lang.String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER"; 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_CONFIGURE_PHONE_ACCOUNT = "android.telecom.action.CONFIGURE_PHONE_ACCOUNT"; field public static final java.lang.String ACTION_DEFAULT_DIALER_CHANGED = "android.telecom.action.DEFAULT_DIALER_CHANGED"; field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL"; field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS"; diff --git a/api/system-current.txt b/api/system-current.txt index 9ef5de5..93624d6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32683,7 +32683,7 @@ package android.telecom { method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle); field public static final java.lang.String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER"; 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_CONFIGURE_PHONE_ACCOUNT = "android.telecom.action.CONFIGURE_PHONE_ACCOUNT"; field public static final java.lang.String ACTION_DEFAULT_DIALER_CHANGED = "android.telecom.action.DEFAULT_DIALER_CHANGED"; field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL"; field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED"; |