am 56024f26: Merge change 26991 into eclair

Merge commit '56024f260f993c70a65aca0081c78b21801a7c5a' into eclair-plus-aosp

* commit '56024f260f993c70a65aca0081c78b21801a7c5a':
  Add null check at isEmergencyNumber().

telephony/java/android/telephony/PhoneNumberUtils.java

@@ -1230,6 +1230,9 @@ public class PhoneNumberUtils
      * listed in the ril / sim, then return true, otherwise false.
      */
     public static boolean isEmergencyNumber(String number) {
+        // If the number passed in is null, just return false:
+        if (number == null) return false;
+
         // Strip the separators from the number before comparing it
         // to the list.
         number = extractNetworkPortion(number);