am 3aff4fdf: am 56024f26: Merge change 26991 into eclair

Merge commit '3aff4fdf5c3dc1078e132bd6eda3ae980b15611e'

* commit '3aff4fdf5c3dc1078e132bd6eda3ae980b15611e':
  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);