diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-14 13:58:26 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-14 13:58:26 -0700 |
commit | 5e4b1b29de5069e7a0861f19ad342fbd3a763e38 (patch) | |
tree | a3ed8eb32d8b065d674e97425ccc46c7bffa97c2 /telephony | |
parent | ff7eddfcf91bf98e45c8a1de100647d2e3233146 (diff) | |
parent | 658b7a5a1a4ac37713371ab13ad9fffe8ae7806f (diff) | |
download | frameworks_base-5e4b1b29de5069e7a0861f19ad342fbd3a763e38.zip frameworks_base-5e4b1b29de5069e7a0861f19ad342fbd3a763e38.tar.gz frameworks_base-5e4b1b29de5069e7a0861f19ad342fbd3a763e38.tar.bz2 |
am 658b7a5a: am 12b6f6ea: am 55b7d124: merge from open-source master
Diffstat (limited to 'telephony')
-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; } |