diff options
| author | Nancy Chen <nancychen@google.com> | 2014-09-17 03:41:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 03:41:02 +0000 |
| commit | 68e3e27a1e3bc9dc2df1ce89e5a23672080bf246 (patch) | |
| tree | c9e51fa2563cc8cc1a8ac3b8b688fdea0a08850a /api | |
| parent | a2a62e416142ab9b8e33cfc1cad5045ced152c9b (diff) | |
| parent | ebc69cd19e3c4a40748410f6d509989e83829f1b (diff) | |
| download | frameworks_base-68e3e27a1e3bc9dc2df1ce89e5a23672080bf246.zip frameworks_base-68e3e27a1e3bc9dc2df1ce89e5a23672080bf246.tar.gz frameworks_base-68e3e27a1e3bc9dc2df1ce89e5a23672080bf246.tar.bz2 | |
am 05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev
* commit '05a2c7ef905777fdbc1129146df6f389e2e6980a':
Remove ability to enable/disable phoneaccounts (1/6)
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 389261f..b8a81a1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28220,7 +28220,6 @@ package android.telecom { method public android.net.Uri getSubscriptionAddress(); method public java.util.List<java.lang.String> getSupportedUriSchemes(); method public boolean hasCapabilities(int); - method public boolean isEnabled(); method public boolean supportsUriScheme(java.lang.String); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1 @@ -28350,21 +28349,19 @@ package android.telecom { method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle); method public void cancelMissedCallsNotification(); method public void clearAccounts(); + method public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts(); method public android.telecom.PhoneAccountHandle getConnectionManager(); method public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String); - method public java.util.List<android.telecom.PhoneAccountHandle> getEnabledPhoneAccounts(); method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle); method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(java.lang.String); method public boolean handleMmi(java.lang.String); - method public boolean hasMultipleEnabledAccounts(); + method public boolean hasMultipleCallCapableAccounts(); method public boolean isInCall(); method public void registerPhoneAccount(android.telecom.PhoneAccount); method public void showInCallScreen(boolean); method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle); 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_PHONE_ACCOUNT_DISABLED = "android.telecom.action.PHONE_ACCOUNT_DISABLED"; - field public static final java.lang.String ACTION_PHONE_ACCOUNT_ENABLED = "android.telecom.action.PHONE_ACCOUNT_ENABLED"; field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS"; field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ',' field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';' |