commit 36bb2546cbc86a4e6d338c3c31bbd02c4602b5e2
author Yorke Lee <yorkelee@google.com> Thu Jun 05 08:09:52 2014 -0700
committer Yorke Lee <yorkelee@google.com> Fri Jun 06 10:13:54 2014 -0700
tree 0d0acaf5ffc15cdb5e1cd941755738574836966e
parent 833e0fb6f616e57f8439900590de53e668854c4d

Follow API change in PhoneNumberUtils

Bug: 15432083
Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9

src/com/android/phone/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 986c366..f7f5028 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -737,8 +737,8 @@
 
         if (fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
             Connection c = fgPhone.getForegroundCall().getLatestConnection();
-            if ((c != null) && (PhoneNumberUtils.isLocalEmergencyNumber(c.getAddress(),
-                                                                        mApplication))) {
+            if ((c != null) && (PhoneNumberUtils.isLocalEmergencyNumber(mApplication,
+                                                                        c.getAddress()))) {
                 if (VDBG) log("onPhoneStateChanged: it is an emergency call.");
                 Call.State callState = fgPhone.getForegroundCall().getState();
                 if (mEmergencyTonePlayerVibrator == null) {
@@ -1039,7 +1039,7 @@
             final String number = c.getAddress();
             final Phone phone = c.getCall().getPhone();
             final boolean isEmergencyNumber =
-                    PhoneNumberUtils.isLocalEmergencyNumber(number, mApplication);
+                    PhoneNumberUtils.isLocalEmergencyNumber(mApplication, number);
 
             if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
                 if ((isEmergencyNumber)