diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-26 01:59:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-26 01:59:20 +0000 |
| commit | 6ae9f751d7fe2ff64ccc5c6f9bf9f15d60cef042 (patch) | |
| tree | 71f651124922c345bfcca2687f918dce76e7e927 /java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java | |
| parent | 2b22f7d6184bc12091fdc8a39164d5e391c8ccff (diff) | |
| parent | 04306a75588b58208758f43821e1898c6f125baf (diff) | |
Merge changes I3d097d14,Idd6604e5
* changes:
Update preferred SIM SuggestionProvider
Remove non call log dependencies on PhoneAccountUtil
Diffstat (limited to 'java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java')
| -rw-r--r-- | java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java b/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java index 76892552b..2e4caa920 100644 --- a/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java +++ b/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java @@ -44,7 +44,6 @@ import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment; import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.SelectPhoneAccountListener; -import com.android.dialer.calllogutils.PhoneAccountUtils; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.telephony.TelephonyManagerCompat; @@ -215,7 +214,7 @@ public class SpecialCharSequenceMgr { sc.progressDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); List<PhoneAccountHandle> subscriptionAccountHandles = - PhoneAccountUtils.getSubscriptionPhoneAccounts(context); + TelecomUtil.getSubscriptionPhoneAccounts(context); Context applicationContext = context.getApplicationContext(); boolean hasUserSelectedDefault = subscriptionAccountHandles.contains( @@ -272,7 +271,7 @@ public class SpecialCharSequenceMgr { static boolean handlePinEntry(final Context context, final String input) { if ((input.startsWith("**04") || input.startsWith("**05")) && input.endsWith("#")) { List<PhoneAccountHandle> subscriptionAccountHandles = - PhoneAccountUtils.getSubscriptionPhoneAccounts(context); + TelecomUtil.getSubscriptionPhoneAccounts(context); boolean hasUserSelectedDefault = subscriptionAccountHandles.contains( TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL)); |