Helper methods for our t9 searches

Change-Id: Ia9edf198bda37efdf6f5ca16c8387a737b99be8b

2 files changed, 19 insertions, 3 deletions

diff --git a/src-ambient/incall/CallMethodHelper.java b/src-ambient/incall/CallMethodHelper.java
index 0474ad9..c1461b8 100644
--- a/src-ambient/incall/CallMethodHelper.java
+++ b/src-ambient/incall/CallMethodHelper.java
@@ -155,6 +155,15 @@ public class CallMethodHelper {
         return cmi;
     }
 
+    public static CallMethodInfo getMethodForMimeType(String mimeType) {
+        for (CallMethodInfo entry : getAllCallMethods().values()) {
+            if (entry.mMimeType.equals(mimeType)) {
+                return entry;
+            }
+        }
+        return null;
+    }
+
     /***
      * Registers the client, on register returns boolean if
      * callMethodInfo data is already collected and the initial broadcast has been sent.
diff --git a/src-ambient/incall/CallMethodInfo.java b/src-ambient/incall/CallMethodInfo.java
index b68e74d..32125f2 100644
--- a/src-ambient/incall/CallMethodInfo.java
+++ b/src-ambient/incall/CallMethodInfo.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
+import android.provider.ContactsContract;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SubscriptionManager;
 import android.util.Log;
@@ -146,11 +147,16 @@ public class CallMethodInfo {
     }
 
     public void placeCall(String origin, String number, Context c, boolean isVideoCall) {
-        placeCall(origin, number, c, isVideoCall, false);
+        placeCall(origin, number, c, isVideoCall, false, null);
+    }
+
+    public void placeCall(String origin, String number, Context c, boolean isVideoCall, boolean
+            forcePSTN) {
+        placeCall(origin, number, c, isVideoCall, forcePSTN, null);
     }
 
     public void placeCall(String origin, String number, Context c, boolean isVideoCall,
-                          boolean forcePSTN) {
+                          boolean forcePSTN, String numberMimeType) {
         StartInCallCallReceiver svcrr = CallMethodHelper.getVoIPResultReceiver(this, origin);
         StartCallRequest request = new StartCallRequest(number, origin, 0, svcrr);
 
@@ -158,7 +164,8 @@ public class CallMethodInfo {
             InCallServices.getInstance().startVideoCall(
                     AmbientConnection.CLIENT.get(c), this.mComponent, request);
         } else {
-            if (PhoneNumberUtils.isGlobalPhoneNumber(number) || forcePSTN) {
+            if (forcePSTN || (numberMimeType != null && numberMimeType.equals(ContactsContract
+                    .CommonDataKinds.Phone.CONTENT_ITEM_TYPE))) {
                 InCallServices.getInstance().startOutCall(
                         AmbientConnection.CLIENT.get(c), this.mComponent, request);
             } else {