diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-14 13:52:52 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-14 13:52:52 -0700 |
| commit | 55b7d1243f15395a102971e8fdc57444638729ac (patch) | |
| tree | 1dfc4a8feb15fceb73562aa14c7f641336314b92 | |
| parent | 3d52305faa682366eb34c30892ddd2b390940048 (diff) | |
| parent | a2adf8f394bd568b6108fe989b0ac0ca2072670d (diff) | |
| download | frameworks_base-55b7d1243f15395a102971e8fdc57444638729ac.zip frameworks_base-55b7d1243f15395a102971e8fdc57444638729ac.tar.gz frameworks_base-55b7d1243f15395a102971e8fdc57444638729ac.tar.bz2 | |
merge from open-source master
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
| -rw-r--r-- | telephony/java/com/android/internal/telephony/PhoneBase.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/PhoneBase.java b/telephony/java/com/android/internal/telephony/PhoneBase.java index a8f4143..74601e6 100644 --- 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; } |