am 12b6f6ea: am 55b7d124: merge from open-source master

2010-05-14 13:56:41 -07:00
parent cb0bdf19f5 12b6f6eaee
commit 658b7a5a1a
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
@@ -543,7 +543,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;
        }