am ac54b6f5: am 1eb16ea1: When dialing voicemail, check voicemail number of correct default SIM.
* commit 'ac54b6f530937d84de26458caab5a7a2055b4cb0':
When dialing voicemail, check voicemail number of correct default SIM.
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index ce6475e..f1112f1 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -924,9 +924,10 @@
PhoneAccountUtils.getSubscriptionPhoneAccounts(getActivity());
boolean hasUserSelectedDefault = subscriptionAccountHandles.contains(
getTelecomManager().getUserSelectedOutgoingPhoneAccount());
- boolean multiSim = subscriptionAccountHandles.size() > 1;
+ boolean needsAccountDisambiguation = subscriptionAccountHandles.size() > 1
+ && !hasUserSelectedDefault;
- if ((multiSim && !hasUserSelectedDefault) || isVoicemailAvailable()) {
+ if (needsAccountDisambiguation || isVoicemailAvailable()) {
// On a multi-SIM phone, if the user has not selected a default
// subscription, initiate a call to voicemail so they can select an account
// from the "Call with" dialog.
@@ -1519,13 +1520,21 @@
/**
* Check if voicemail is enabled/accessible.
*
- * @return true if voicemail is enabled and accessibly. Note that this can be false
+ * @return true if voicemail is enabled and accessible. Note that this can be false
* "temporarily" after the app boot.
- * @see TelephonyManager#getVoiceMailNumber()
+ * @see TelecomManager#hasVoiceMailNumber(PhoneAccountHandle)
*/
private boolean isVoicemailAvailable() {
try {
- return getTelephonyManager().getVoiceMailNumber() != null;
+ PhoneAccountHandle defaultUserSelectedAccount =
+ getTelecomManager().getUserSelectedOutgoingPhoneAccount();
+ if (defaultUserSelectedAccount == null) {
+ // In a single-SIM phone, there is no default outgoing phone account selected by
+ // the user, so just call TelephonyManager#getVoicemailNumber directly.
+ return getTelephonyManager().getVoiceMailNumber() != null;
+ } else {
+ return getTelecomManager().hasVoiceMailNumber(defaultUserSelectedAccount);
+ }
} catch (SecurityException se) {
// Possibly no READ_PHONE_STATE privilege.
Log.w(TAG, "SecurityException is thrown. Maybe privilege isn't sufficient.");