diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-05-14 11:39:06 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-05-14 11:39:06 -0700 |
| commit | a2adf8f394bd568b6108fe989b0ac0ca2072670d (patch) | |
| tree | 64e94fe4aeca5538b319a27355c87208370c2aa0 | |
| parent | 75e181b633ec94dde4a5a62d28040289ad645e74 (diff) | |
| parent | eccd93c7eb8d31f71023f9d32cf0fb40bb097fa6 (diff) | |
| download | frameworks_base-a2adf8f394bd568b6108fe989b0ac0ca2072670d.zip frameworks_base-a2adf8f394bd568b6108fe989b0ac0ca2072670d.tar.gz frameworks_base-a2adf8f394bd568b6108fe989b0ac0ca2072670d.tar.bz2 | |
Merge "SetLocaleByCarrier, only if its not an unknown carrier."
| -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 eb406b7..a2554ba 100644 --- 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; } |