am 55b7d124: merge from open-source master

Merge commit '55b7d1243f15395a102971e8fdc57444638729ac' into kraken

* commit '55b7d1243f15395a102971e8fdc57444638729ac':
  SetLocaleByCarrier, only if its not an unknown carrier.
This commit is contained in:
The Android Open Source Project
2010-05-14 13:54:56 -07:00
committed by Android Git Automerger

View File

@@ -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;
}