Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 56024f26: Merge change 26991 into eclair

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

* commit '56024f260f993c70a65aca0081c78b21801a7c5a':
  Add null check at isEmergencyNumber().
This commit is contained in:
Peng Zhu
2009-09-24 19:55:42 -07:00
committed by Android Git Automerger
parent b2209a35af 56024f260f
commit 3aff4fdf5c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -1230,6 +1230,9 @@ public class PhoneNumberUtils
* listed in the ril / sim, then return true, otherwise false. * listed in the ril / sim, then return true, otherwise false.
*/ */
public static boolean isEmergencyNumber(String number) { 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 // Strip the separators from the number before comparing it
// to the list. // to the list.
number = extractNetworkPortion(number); number = extractNetworkPortion(number);