diff options
author | Andrew Lee <anwlee@google.com> | 2014-09-04 23:34:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 23:34:41 +0000 |
commit | 8d223eb3f92a521f22acc4639a6d1999f7fe26ba (patch) | |
tree | 5169e93e97198e3cfa4741a9eea6282db5fba7d2 /telecomm | |
parent | 26573425da45e5b764b1d5dfa450429fdb30d6d7 (diff) | |
parent | d4abbfbcc16ae3e9bae77573496161ff561f8ced (diff) | |
download | frameworks_base-8d223eb3f92a521f22acc4639a6d1999f7fe26ba.zip frameworks_base-8d223eb3f92a521f22acc4639a6d1999f7fe26ba.tar.gz frameworks_base-8d223eb3f92a521f22acc4639a6d1999f7fe26ba.tar.bz2 |
Merge "Tweak methods for get/set DefaultOutgoing phone account." into lmp-dev
Diffstat (limited to 'telecomm')
-rw-r--r-- | telecomm/java/android/telecomm/TelecommManager.java | 28 | ||||
-rw-r--r-- | telecomm/java/com/android/internal/telecomm/ITelecommService.aidl | 9 |
2 files changed, 32 insertions, 5 deletions
diff --git a/telecomm/java/android/telecomm/TelecommManager.java b/telecomm/java/android/telecomm/TelecommManager.java index 071b719..5486be1 100644 --- a/telecomm/java/android/telecomm/TelecommManager.java +++ b/telecomm/java/android/telecomm/TelecommManager.java @@ -287,16 +287,38 @@ public class TelecommManager { } /** + * 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"); } } diff --git a/telecomm/java/com/android/internal/telecomm/ITelecommService.aidl b/telecomm/java/com/android/internal/telecomm/ITelecommService.aidl index a6ab3ac..6ab78c4 100644 --- a/telecomm/java/com/android/internal/telecomm/ITelecommService.aidl +++ b/telecomm/java/com/android/internal/telecomm/ITelecommService.aidl @@ -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 |