Merge "SetLocaleByCarrier, only if its not an unknown carrier."

Jean-Baptiste Queru · Android Code Review · commit a2adf8f394bd · 2010-05-14T11:39:06.000-07:00
diff --git a/telephony/java/com/android/internal/telephony/PhoneBase.java b/telephony/java/com/android/internal/telephony/PhoneBase.java
@@ -540,7 +540,7 @@ private void checkCorrectThread(Handler h) {
     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;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ private void checkCorrectThread(Handler h) {`
`540`	`540`	`private void setPropertiesByCarrier() {`
`541`	`541`	`String carrier = SystemProperties.get("ro.carrier");`
`542`	`542`
`543`		`- if (null == carrier \|\| 0 == carrier.length()) {`
	`543`	`+ if (null == carrier \|\| 0 == carrier.length() \|\| "unknown".equals(carrier)) {`
`544`	`544`	`return;`
`545`	`545`	`}`
`546`	`546`