commit 639b823b287211a67e525238c5f2f4e2a9ebc0c6
author Brett Chabot <brettchabot@android.com> Thu Feb 11 12:27:59 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 11 12:27:59 2010 -0800
tree d28652020aba47e3d958f3afc8e9b168a641fe45
parent 8bbe558c4fbff327dcb91acd42f4c927079c7359
parent 5d7d62cd294ece842fd5a9cd9abd5a628a5c1a11

Merge "Fix build." into eclair

tests/tests/telephony/src/android/telephony/cts/PhoneNumberUtilsTest.java

diff --git a/tests/tests/telephony/src/android/telephony/cts/PhoneNumberUtilsTest.java b/tests/tests/telephony/src/android/telephony/cts/PhoneNumberUtilsTest.java
index 10310fd..ecc2b09d 100644
--- a/tests/tests/telephony/src/android/telephony/cts/PhoneNumberUtilsTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/PhoneNumberUtilsTest.java
@@ -520,7 +520,10 @@
         assertFalse(PhoneNumberUtils.isStartsPostDial(c));
 
         // Test isEmergencyNumber, now only know US emergency number
-        if (Locale.getDefault().getCountry().equals("US")) {
+        TelephonyManager tm = (TelephonyManager)getContext().getSystemService(
+                 Context.TELEPHONY_SERVICE);
+        // Test isEmergencyNumber, now only know US emergency number
+        if ("US".equals(tm.getSimCountryIso())) {
             assertTrue(PhoneNumberUtils.isEmergencyNumber("911"));
             assertFalse(PhoneNumberUtils.isEmergencyNumber("119"));
         }