Merge change 26991 into eclair

* changes:
  Add null check at isEmergencyNumber().

1 files changed, 3 insertions, 0 deletions

diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index 046bfea3c94b..32657089b910 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/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);