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:
committed by
Android Git Automerger
commit
12b6f6eaee
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user