Merge "SetLocaleByCarrier, only if its not an unknown carrier."

2010-05-14 11:39:06 -07:00
parent 75e181b633 eccd93c7eb
commit a2adf8f394
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/PhoneBase.java
+++ b/telephony/java/com/android/internal/telephony/PhoneBase.java
@@ -540,7 +540,7 @@ public abstract class PhoneBase extends Handler implements Phone {
    private void setPropertiesByCarrier() {
        String carrier = SystemProperties.get("ro.carrier");

-        if (null == carrier || 0 == carrier.length()) {
+        if (null == carrier || 0 == carrier.length() || "unknown".equals(carrier)) {
            return;
        }