From 694bd8bf733aee372705e00d13964a20e5b16209 Mon Sep 17 00:00:00 2001 From: Peng Zhu Date: Thu, 24 Sep 2009 15:34:53 -0400 Subject: [PATCH] Add null check at isEmergencyNumber(). Change-Id: I7eca1ba1ce42e02c7506a7d969e4865778bb49cc --- telephony/java/android/telephony/PhoneNumberUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 046bfea3c94bc..32657089b910d 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);