merge from open-source master

Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
2010-05-14 13:52:52 -07:00
parent 3d52305faa a2adf8f394
commit 55b7d1243f
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;
        }