diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7572ca4578b..cb921ae7395 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3768,6 +3768,8 @@
Edit access point
Not set
+
+ Not set
Name
diff --git a/src/com/android/settings/network/apn/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java
index afc68d5bb29..0b751620ad1 100644
--- a/src/com/android/settings/network/apn/ApnEditor.java
+++ b/src/com/android/settings/network/apn/ApnEditor.java
@@ -632,7 +632,7 @@ public class ApnEditor extends SettingsPreferenceFragment
checkNull(bearerMultiDescription(mBearerMulti.getValues())));
mMvnoType.setSummary(
checkNull(mvnoDescription(mMvnoType.getValue())));
- mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
+ mMvnoMatchData.setSummary(checkNullforMvnoValue(mMvnoMatchData.getText()));
// allow user to edit carrier_enabled for some APN
final boolean ceEditable = getResources().getBoolean(
R.bool.config_allow_edit_carrier_enabled);
@@ -791,7 +791,7 @@ public class ApnEditor extends SettingsPreferenceFragment
}
mMvnoType.setValue((String) newValue);
mMvnoType.setSummary(mvno);
- mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
+ mMvnoMatchData.setSummary(checkNullforMvnoValue(mMvnoMatchData.getText()));
} else if (KEY_PASSWORD.equals(key)) {
mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
} else if (KEY_CARRIER_ENABLED.equals(key)) {
@@ -1216,6 +1216,14 @@ public class ApnEditor extends SettingsPreferenceFragment
return TextUtils.isEmpty(value) ? sNotSet : value;
}
+ /**
+ * To make traslation be diversity, use another string id for MVNO value.
+ */
+ private String checkNullforMvnoValue(String value) {
+ String notSetForMvnoValue = getResources().getString(R.string.apn_not_set_for_mvno);
+ return TextUtils.isEmpty(value) ? notSetForMvnoValue : value;
+ }
+
/**
* Returns null if the given string {@code value} equals to {@link #sNotSet}. This method
* should be used when convert a string value from preference to database.