summaryrefslogtreecommitdiffstats
path: root/src/com/android/dialer/SpecialCharSequenceMgr.java
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-10-16 18:33:51 -0700
committerNancy Chen <nancychen@google.com>2014-10-30 14:58:12 -0700
commit675af1f3d3dbaedad78920f36fa501113a55ba65 (patch)
treecfe3e0b086eaa4c091285fe727076d1f28d407e9 /src/com/android/dialer/SpecialCharSequenceMgr.java
parent35741bb2f60cf438595950d08d078962e6cac3af (diff)
downloadandroid_packages_apps_Dialer-675af1f3d3dbaedad78920f36fa501113a55ba65.tar.gz
android_packages_apps_Dialer-675af1f3d3dbaedad78920f36fa501113a55ba65.tar.bz2
android_packages_apps_Dialer-675af1f3d3dbaedad78920f36fa501113a55ba65.zip
Enable MMI for multi-SIM (3/3)
+ Add Telecomm and Telephony methods for handlePinMMIForSubscriber + Add Select Account dialog in Dialer for MMI Bug: 17917937 Change-Id: Iaabd0c5705cdf0d325aa7514d04935747078b28c
Diffstat (limited to 'src/com/android/dialer/SpecialCharSequenceMgr.java')
-rw-r--r--src/com/android/dialer/SpecialCharSequenceMgr.java52
1 files changed, 49 insertions, 3 deletions
diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 8e56e45e5..2bf1afcf9 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -16,6 +16,7 @@
package com.android.dialer;
+import android.app.Activity;
import android.app.AlertDialog;
import android.app.KeyguardManager;
import android.app.ProgressDialog;
@@ -28,6 +29,7 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Looper;
import android.provider.Settings;
+import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.PhoneNumberUtils;
import android.telephony.TelephonyManager;
@@ -38,7 +40,13 @@ import android.widget.Toast;
import com.android.common.io.MoreCloseables;
import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler;
+import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment;
+import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.SelectPhoneAccountListener;
+import com.android.dialer.calllog.PhoneAccountUtils;
+import com.android.incallui.InCallPresenter;
+import java.util.Arrays;
+import java.util.List;
import java.util.ArrayList;
import java.util.List;
@@ -217,11 +225,49 @@ public class SpecialCharSequenceMgr {
return false;
}
- static boolean handlePinEntry(Context context, String input) {
+ static boolean handlePinEntry(Context context, final String input) {
if ((input.startsWith("**04") || input.startsWith("**05")) && input.endsWith("#")) {
- TelecomManager telecomManager =
+ final TelecomManager telecomManager =
(TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
- return telecomManager.handleMmi(input);
+ List<PhoneAccountHandle> phoneAccountHandles =
+ PhoneAccountUtils.getSubscriptionPhoneAccounts(context);
+ boolean hasUserSelectedDefault = hasDefaultSubscriptionAccount(
+ telecomManager.getUserSelectedOutgoingPhoneAccount(), phoneAccountHandles);
+
+ if (phoneAccountHandles.size() == 1 || hasUserSelectedDefault) {
+ // Don't bring up the dialog for single-SIM or if the default outgoing account is
+ // a subscription account.
+ return telecomManager.handleMmi(input);
+ } else if (phoneAccountHandles.size() > 1){
+ SelectPhoneAccountListener listener = new SelectPhoneAccountListener() {
+ @Override
+ public void onPhoneAccountSelected(PhoneAccountHandle selectedAccountHandle,
+ boolean setDefault) {
+ telecomManager.handleMmi(selectedAccountHandle, input);
+ //TODO: show error dialog if result isn't valid
+ }
+ @Override
+ public void onDialogDismissed() {}
+ };
+
+ SelectPhoneAccountDialogFragment.showAccountDialog(
+ ((Activity) context).getFragmentManager(), false, phoneAccountHandles,
+ listener);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Check if the default outgoing phone account set is a subscription phone account.
+ */
+ static private boolean hasDefaultSubscriptionAccount(PhoneAccountHandle defaultOutgoingAccount,
+ List<PhoneAccountHandle> phoneAccountHandles) {
+ for (PhoneAccountHandle accountHandle : phoneAccountHandles) {
+ if (accountHandle.equals(defaultOutgoingAccount)) {
+ return true;
+ }
}
return false;
}