TelephonyProvider :Add multi-language APN name support

Add a new column "localized_name" to the carriers database for
multi-language APN name support.

The value of localized_name refers to a string resource id in
Strings.xml

Change-Id: If31fc826cebf95ff424377e0bf6173557cbd4560

2 files changed, 7 insertions, 0 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5170e20..25b6429 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,4 +33,7 @@
 
     <!-- Apn PPP number -->
     <string name="ppp_number">ppp_number</string>
+
+    <!-- Apn localized name -->
+    <string name="localized_name">localized_name</string>
 </resources>
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index c090899..a7e1d0a 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -100,6 +100,7 @@ public class TelephonyProvider extends ContentProvider
     private static final String OLD_APNS_PATH = "etc/old-apns-conf.xml";
 
     private static final String READ_ONLY = "read_only";
+    private static final String LOCALIZED_NAME = "localized_name";
 
     private static final UriMatcher s_urlMatcher = new UriMatcher(UriMatcher.NO_MATCH);
 
@@ -273,6 +274,7 @@ public class TelephonyProvider extends ContentProvider
                     "edited INTEGER DEFAULT " + Telephony.Carriers.UNEDITED + "," +
                     "read_only BOOLEAN DEFAULT 0," +
                     "ppp_number TEXT DEFAULT ''," +
+                    "localized_name TEXT DEFAULT ''," +
                     // Uniqueness collisions are used to trigger merge code so if a field is listed
                     // here it means we will accept both (user edited + new apn_conf definition)
                     // Columns not included in UNIQUE constraint: name, current, edited,
@@ -939,6 +941,8 @@ public class TelephonyProvider extends ContentProvider
             map.put(Telephony.Carriers.NAME, parser.getAttributeValue(null, "carrier"));
             map.put(mContext.getString(R.string.ppp_number),
                     parser.getAttributeValue(null, "ppp_number"));
+            map.put(mContext.getString(R.string.localized_name),
+                    parser.getAttributeValue(null, "localized_name"));
 
             // do not add NULL to the map so that default values can be inserted in db
             addStringAttribute(parser, "apn", map, Telephony.Carriers.APN);