Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev

Browse Source 
automerge: 7d901cb

* commit '7d901cb6f54f31b01b9951599ba6abdcff580e42':
  Make APIs to get system phone accounts public
This commit is contained in:
Sailesh Nepal
2014-11-06 21:41:44 +00:00
committed by android-build-merger
parent 91fff05ba9 7d901cb6f5
commit fe319eabbc
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -28410,8 +28410,10 @@ package android.telecom {
method public void clearAccounts(); method public void clearAccounts();
method public android.net.Uri getAdnUriForPhoneAccount(android.telecom.PhoneAccountHandle); method public android.net.Uri getAdnUriForPhoneAccount(android.telecom.PhoneAccountHandle);
method public android.telecom.PhoneAccountHandle getConnectionManager(); method public android.telecom.PhoneAccountHandle getConnectionManager();
method public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String);
method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle); method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);
method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage(); method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage();
method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(java.lang.String);
method public boolean handleMmi(java.lang.String); method public boolean handleMmi(java.lang.String);
method public boolean handleMmi(android.telecom.PhoneAccountHandle, java.lang.String); method public boolean handleMmi(android.telecom.PhoneAccountHandle, java.lang.String);
method public boolean hasMultipleCallCapableAccounts(); method public boolean hasMultipleCallCapableAccounts();

4
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -338,8 +338,6 @@ public class TelecomManager {
* @param uriScheme The URI scheme. * @param uriScheme The URI scheme.
* @return The {@link PhoneAccountHandle} corresponding to the user-chosen default for outgoing * @return The {@link PhoneAccountHandle} corresponding to the user-chosen default for outgoing
* phone calls for a specified URI scheme. * phone calls for a specified URI scheme.
*
* @hide
*/ */
public PhoneAccountHandle getDefaultOutgoingPhoneAccount(String uriScheme) { public PhoneAccountHandle getDefaultOutgoingPhoneAccount(String uriScheme) {
try { try {
@@ -459,8 +457,6 @@ public class TelecomManager {
* *
* @param uriScheme The URI scheme. * @param uriScheme The URI scheme.
* @return A list of {@code PhoneAccountHandle} objects supporting the URI scheme. * @return A list of {@code PhoneAccountHandle} objects supporting the URI scheme.
*
* @hide
*/ */
public List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(String uriScheme) { public List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(String uriScheme) {
try { try {