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

am 1cc96754: Merge "Tweak methods for get/set DefaultOutgoing phone account." into lmp-dev

Browse Source 
* commit '1cc96754140f8298898adaf498db9c086cc08df8':
  Tweak methods for get/set DefaultOutgoing phone account.
This commit is contained in:
Andrew Lee
2014-09-04 23:45:28 +00:00
committed by Android Git Automerger
parent d592c861a0 8d223eb3f9
commit 00a37404b8
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
telecomm/java/android/telecomm/TelecommManager.java
View File

@@ -286,17 +286,39 @@ public class TelecommManager {
return null;
}
/**
* Return the {@link PhoneAccount} which is the user-chosen default for making outgoing phone
* calls. This {@code PhoneAccount} will always be a member of the list which is returned from
* calling {@link #getEnabledPhoneAccounts()}
*
* Apps must be prepared for this method to return {@code null}, indicating that there currently
* exists no user-chosen default {@code PhoneAccount}.
*
* @return The user outgoing phone account selected by the user.
* @hide
*/
public PhoneAccountHandle getUserSelectedOutgoingPhoneAccount() {
try {
if (isServiceConnected()) {
return getTelecommService().getUserSelectedOutgoingPhoneAccount();
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelecommService#getUserSelectedOutgoingPhoneAccount", e);
}
return null;
}
/**
* Sets the default account for making outgoing phone calls.
* @hide
*/
public void setDefaultOutgoingPhoneAccount(PhoneAccountHandle accountHandle) {
public void setUserSelectedOutgoingPhoneAccount(PhoneAccountHandle accountHandle) {
try {
if (isServiceConnected()) {
getTelecommService().setDefaultOutgoingPhoneAccount(accountHandle);
getTelecommService().setUserSelectedOutgoingPhoneAccount(accountHandle);
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelecommService#setDefaultOutgoingPhoneAccount");
Log.e(TAG, "Error calling ITelecommService#setUserSelectedOutgoingPhoneAccount");
}
}

9
telecomm/java/com/android/internal/telecomm/ITelecommService.aidl
View File

@@ -40,9 +40,14 @@ interface ITelecommService {
PhoneAccountHandle getDefaultOutgoingPhoneAccount(in String uriScheme);
/**
* @see TelecommServiceImpl#setDefaultOutgoingPhoneAccount
* @see TelecommServiceImpl#getUserSelectedOutgoingPhoneAccount
*/
void setDefaultOutgoingPhoneAccount(in PhoneAccountHandle account);
PhoneAccountHandle getUserSelectedOutgoingPhoneAccount();
/**
* @see TelecommServiceImpl#setUserSelectedOutgoingPhoneAccount
*/
void setUserSelectedOutgoingPhoneAccount(in PhoneAccountHandle account);
/**
* @see TelecommServiceImpl#getOutgoingPhoneAccounts