diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-14 13:54:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-14 13:54:56 -0700 |
| commit | 12b6f6eaee7e92b80d04eb3b6387a08454007b8d (patch) | |
| tree | 488614969774764bf493787aec65b91cd0153967 /telephony | |
| parent | ad8ce5346a3c5ac6d29246373bf129f9d6567d9f (diff) | |
| parent | 55b7d1243f15395a102971e8fdc57444638729ac (diff) | |
| download | frameworks_base-12b6f6eaee7e92b80d04eb3b6387a08454007b8d.zip frameworks_base-12b6f6eaee7e92b80d04eb3b6387a08454007b8d.tar.gz frameworks_base-12b6f6eaee7e92b80d04eb3b6387a08454007b8d.tar.bz2 | |
am 55b7d124: merge from open-source master
Merge commit '55b7d1243f15395a102971e8fdc57444638729ac' into kraken
* commit '55b7d1243f15395a102971e8fdc57444638729ac':
SetLocaleByCarrier, only if its not an unknown carrier.
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; } |