diff --git a/src/com/android/phone/InCallScreen.java b/src/com/android/phone/InCallScreen.java
index 15d2ed4..cd7ab95 100755
--- a/src/com/android/phone/InCallScreen.java
+++ b/src/com/android/phone/InCallScreen.java
@@ -2486,7 +2486,7 @@
             return intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
         }
 
-        return PhoneUtils.getNumberFromIntent(this, mPhone, intent);
+        return PhoneUtils.getNumberFromIntent(this, intent);
     }
 
     /**
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 625139b..cf42636 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -1157,7 +1157,6 @@
      * "number" is actually the SIP address.
      *
      * @param context a context to use (or
-     * @param phone the phone on which the number would be called
      * @param intent the intent
      *
      * @throws VoiceMailNumberMissingException if <code>intent</code> contains
@@ -1167,7 +1166,7 @@
      * @return the phone number (or SIP address) that would be called by the intent,
      *         or <code>null</code> if the number cannot be found.
      */
-    static String getNumberFromIntent(Context context, Phone phone, Intent intent)
+    static String getNumberFromIntent(Context context, Intent intent)
             throws VoiceMailNumberMissingException {
         Uri uri = intent.getData();
         String scheme = uri.getScheme();
