commit 6625545769bd9c5aa15b7e1ee9402f75ad799e81
author Yorke Lee <yorkelee@google.com> Thu Jun 05 08:09:24 2014 -0700
committer Yorke Lee <yorkelee@google.com> Fri Jun 06 10:13:03 2014 -0700
tree 04cc3eb1e9d61bf88cb2388ce81b417eaf5d44e9
parent 75b6fc5e4e91b2ee4c5a8897ecce5932ce0b90b8

Follow API change in PhoneNumberUtils

Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9

src/com/android/telecomm/Call.java

diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 2c54e82..66f9366 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -258,7 +258,7 @@
         if ((mHandle == null && handle != null) || (mHandle != null && !mHandle.equals(handle))) {
             mHandle = handle;
             mIsEmergencyCall = mHandle != null && PhoneNumberUtils.isLocalEmergencyNumber(
-                    mHandle.getSchemeSpecificPart(), TelecommApp.getInstance());
+                    TelecommApp.getInstance(), mHandle.getSchemeSpecificPart());
             startCallerInfoLookup();
         }
     }

src/com/android/telecomm/CallLogManager.java

diff --git a/src/com/android/telecomm/CallLogManager.java b/src/com/android/telecomm/CallLogManager.java
index e7cdab4..2dd6214 100644
--- a/src/com/android/telecomm/CallLogManager.java
+++ b/src/com/android/telecomm/CallLogManager.java
@@ -132,7 +132,7 @@
             int callType,
             long start,
             long duration) {
-        boolean isEmergencyNumber = PhoneNumberUtils.isLocalEmergencyNumber(number, mContext);
+        boolean isEmergencyNumber = PhoneNumberUtils.isLocalEmergencyNumber(mContext, number);
 
         // On some devices, to avoid accidental redialing of emergency numbers, we *never* log
         // emergency calls to the Call Log.  (This behavior is set on a per-product basis, based

src/com/android/telecomm/EmergencyCallServiceSelector.java

diff --git a/src/com/android/telecomm/EmergencyCallServiceSelector.java b/src/com/android/telecomm/EmergencyCallServiceSelector.java
index 18a5b15..40ff11e 100644
--- a/src/com/android/telecomm/EmergencyCallServiceSelector.java
+++ b/src/com/android/telecomm/EmergencyCallServiceSelector.java
@@ -42,7 +42,7 @@
      */
     static boolean shouldUseSelector(Uri handle) {
         return PhoneNumberUtils.isPotentialLocalEmergencyNumber(
-                handle.getSchemeSpecificPart(), TelecommApp.getInstance());
+                TelecommApp.getInstance(), handle.getSchemeSpecificPart());
     }
 
     /** {@inheritDoc} */

src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java

diff --git a/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java b/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
index 41d568f..a0a7c00 100644
--- a/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
+++ b/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
@@ -110,7 +110,7 @@
             if (resultHandle == null) {
                 Log.v(this, "Call cancelled (null number), returning...");
                 return;
-            } else if (PhoneNumberUtils.isPotentialLocalEmergencyNumber(resultHandle, context)) {
+            } else if (PhoneNumberUtils.isPotentialLocalEmergencyNumber(context, resultHandle)) {
                 Log.w(this, "Cannot modify outgoing call to emergency number %s.", resultHandle);
                 return;
             }
@@ -341,7 +341,7 @@
      */
     private boolean isPotentialEmergencyNumber(Context context, String handle) {
         Log.v(this, "Checking restrictions for number : %s", Log.pii(handle));
-        return (handle != null) && PhoneNumberUtils.isPotentialLocalEmergencyNumber(handle,context);
+        return (handle != null) && PhoneNumberUtils.isPotentialLocalEmergencyNumber(context,handle);
     }
 
     /**