diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-15 21:25:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-15 21:25:55 +0000 |
| commit | 1a8727b7cd45e9e0b50c56365073513b1cb429ef (patch) | |
| tree | 8f0eb6226ab3c361d77908c004d486483a93e84e | |
| parent | 019131919bf0908dbf1b31d57ebfdcbeda0f865e (diff) | |
| parent | f5d5840b66865e8324db4e01449b5c95a6004ec2 (diff) | |
| download | frameworks_base-1a8727b7cd45e9e0b50c56365073513b1cb429ef.zip frameworks_base-1a8727b7cd45e9e0b50c56365073513b1cb429ef.tar.gz frameworks_base-1a8727b7cd45e9e0b50c56365073513b1cb429ef.tar.bz2 | |
Merge "Make defaultOutgoingPhoneAccount public"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 7575a07..8ae6b47 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30327,6 +30327,7 @@ package android.telecom { method public void cancelMissedCallsNotification(); method public android.net.Uri getAdnUriForPhoneAccount(android.telecom.PhoneAccountHandle); method public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts(); + method public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String); method public java.lang.String getLine1Number(android.telecom.PhoneAccountHandle); method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle); method public android.telecom.PhoneAccountHandle getSimCallManager(); diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index c10834a..28534ea 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -355,9 +355,7 @@ public class TelecomManager { * @param uriScheme The URI scheme. * @return The {@link PhoneAccountHandle} corresponding to the user-chosen default for outgoing * phone calls for a specified URI scheme. - * @hide */ - @SystemApi public PhoneAccountHandle getDefaultOutgoingPhoneAccount(String uriScheme) { try { if (isServiceConnected()) { |