summaryrefslogtreecommitdiffstats
path: root/src/com/android/dialer/SpecialCharSequenceMgr.java
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-04-15 21:24:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-15 21:24:22 +0000
commit1582ac15d1f30a651000aa5d5098d73be3aa4810 (patch)
tree8e2da21eb2af4a5f9cb2c4b4ac3ff179ae7bd9e0 /src/com/android/dialer/SpecialCharSequenceMgr.java
parent4015d9e2f59143216e9d749d475e3b1c0ae6a0eb (diff)
parent3af7e5675e118b3f135b5bab1da1f666c8f268d6 (diff)
downloadandroid_packages_apps_Dialer-1582ac15d1f30a651000aa5d5098d73be3aa4810.tar.gz
android_packages_apps_Dialer-1582ac15d1f30a651000aa5d5098d73be3aa4810.tar.bz2
android_packages_apps_Dialer-1582ac15d1f30a651000aa5d5098d73be3aa4810.zip
Merge "Use TelecommManager.getDefaultOutgoingPhoneAccount"
Diffstat (limited to 'src/com/android/dialer/SpecialCharSequenceMgr.java')
-rw-r--r--src/com/android/dialer/SpecialCharSequenceMgr.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 9713a2887..36145aaef 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -30,6 +30,7 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Looper;
import android.provider.Settings;
+import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.PhoneNumberUtils;
@@ -213,7 +214,7 @@ public class SpecialCharSequenceMgr {
PhoneAccountUtils.getSubscriptionPhoneAccounts(context);
boolean hasUserSelectedDefault = subscriptionAccountHandles.contains(
- telecomManager.getUserSelectedOutgoingPhoneAccount());
+ telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL));
if (subscriptionAccountHandles.size() == 1 || hasUserSelectedDefault) {
Uri uri = telecomManager.getAdnUriForPhoneAccount(null);
@@ -278,7 +279,7 @@ public class SpecialCharSequenceMgr {
List<PhoneAccountHandle> subscriptionAccountHandles =
PhoneAccountUtils.getSubscriptionPhoneAccounts(context);
boolean hasUserSelectedDefault = subscriptionAccountHandles.contains(
- telecomManager.getUserSelectedOutgoingPhoneAccount());
+ telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL));
if (subscriptionAccountHandles.size() == 1 || hasUserSelectedDefault) {
// Don't bring up the dialog for single-SIM or if the default outgoing account is