commit 69eb0f582babcedc1dc5e6613a27867be6e8d0e0
author Ihab Awad <ihab@google.com> Fri Jul 18 11:20:37 2014 -0700
committer Ihab Awad <ihab@google.com> Fri Jul 18 15:36:42 2014 -0700
tree 29ddff8ceda5dac4863356a768c307cf3f3cfb17
parent f0ec7f38d3d0b5255733503492c87450a3c3da65

Update connection service iteration for PhoneAccounts

Change-Id: I8f558439016388540af0deaf7c621cff89c9cb36

src/com/android/telecomm/TelephonyUtil.java

diff --git a/src/com/android/telecomm/TelephonyUtil.java b/src/com/android/telecomm/TelephonyUtil.java
index ac19525..2d22491 100644
--- a/src/com/android/telecomm/TelephonyUtil.java
+++ b/src/com/android/telecomm/TelephonyUtil.java
@@ -17,9 +17,9 @@
 package com.android.telecomm;
 
 import android.content.ComponentName;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.telecomm.PhoneAccount;
+import android.content.Context;
+import android.net.Uri;
+import android.telephony.PhoneNumberUtils;
 
 /**
  * Utilities to deal with the system telephony services. The system telephony services are treated
@@ -31,7 +31,7 @@
     private static final String TELEPHONY_PACKAGE_NAME = "com.android.phone";
 
     private static final String PSTN_CALL_SERVICE_CLASS_NAME =
-            "com.android.services.telephony.PstnConnectionService";
+            "com.android.services.telephony.TelephonyConnectionService";
 
     private TelephonyUtil() {}
 
@@ -41,17 +41,8 @@
         return pstnComponentName.equals(componentName);
     }
 
-    private static void verifyConnectionServiceExists(String serviceName) {
-        PackageManager packageManager = TelecommApp.getInstance().getPackageManager();
-        try {
-            ServiceInfo info = packageManager.getServiceInfo(
-                    new ComponentName(TELEPHONY_PACKAGE_NAME, serviceName), 0);
-            if (info == null) {
-                Log.wtf(TAG, "Error, unable to find connection service: %s", serviceName);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.wtf(TAG, e, "Error, exception while trying to find connection service: %s",
-                    serviceName);
-        }
+    static boolean shouldProcessAsEmergency(Context context, Uri handle) {
+        return handle != null && PhoneNumberUtils.isPotentialLocalEmergencyNumber(
+                context, handle.getSchemeSpecificPart());
     }
 }