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/PhoneUtils.java

diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index f79f057..291789d 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -2080,8 +2080,8 @@
 
     static boolean isInEmergencyCall(CallManager cm) {
         for (Connection cn : cm.getActiveFgCall().getConnections()) {
-            if (PhoneNumberUtils.isLocalEmergencyNumber(cn.getAddress(),
-                    PhoneGlobals.getInstance())) {
+            if (PhoneNumberUtils.isLocalEmergencyNumber(PhoneGlobals.getInstance(),
+                    cn.getAddress())) {
                 return true;
             }
         }
@@ -2227,8 +2227,8 @@
                      event.getRepeatCount() == 0) {
                 Connection c = phone.getForegroundCall().getLatestConnection();
                 // If it is NOT an emg #, toggle the mute state. Otherwise, ignore the hook.
-                if (c != null && !PhoneNumberUtils.isLocalEmergencyNumber(c.getAddress(),
-                                                                          PhoneGlobals.getInstance())) {
+                if (c != null && !PhoneNumberUtils.isLocalEmergencyNumber(
+                        PhoneGlobals.getInstance(), c.getAddress())) {
                     if (getMute()) {
                         if (DBG) log("handleHeadsetHook: UNmuting...");
                         setMute(false);