am dd36f149: (-s ours) Import translations. DO NOT MERGE
* commit 'dd36f149b5574211136780885459e94c515cec54':
Import translations. DO NOT MERGE
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4eedae0..f018658 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,5 +17,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" product="tablet" msgid="9194799012395299737">"मोबाइल नेटवर्क कॉन्फ़िगरेशन"</string>
- <string name="app_label" product="default" msgid="4282451239358791628">"फ़ोन/संदेश मेमोरी"</string>
+ <string name="app_label" product="default" msgid="4282451239358791628">"फ़ोन/संदेश संग्रहण"</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 8849a0c..993ca28 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -17,5 +17,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" product="tablet" msgid="9194799012395299737">"മൊബൈൽ നെറ്റ്വർക്ക് കോൺഫിഗറേഷൻ"</string>
- <string name="app_label" product="default" msgid="4282451239358791628">"ഫോൺ/സന്ദേശ സംഭരണം"</string>
+ <string name="app_label" product="default" msgid="4282451239358791628">"ഫോൺ/സന്ദേശമയയ്ക്കൽ സംഭരണം"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index fe6f377..8227c76 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" product="tablet" msgid="9194799012395299737">"မိုဘိုင်း ကွန်ရက် အစီအစဉ်"</string>
+ <string name="app_label" product="tablet" msgid="9194799012395299737">"မိုဘိုင်း ကွန်ယက် အစီအစဉ်"</string>
<string name="app_label" product="default" msgid="4282451239358791628">"ဖုန်း/စာပို့ခြင်း သိုလှောင်မှု"</string>
</resources>
diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index a470bb1..7fd127c 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -42,6 +42,7 @@
import android.provider.Telephony.Mms.Part;
import android.provider.Telephony.Mms.Rate;
import android.provider.Telephony.MmsSms.PendingMessages;
+import android.telephony.SubscriptionManager;
import android.util.Log;
import com.google.android.mms.pdu.EncodedStringValue;
@@ -592,7 +593,7 @@
Mms.DELIVERY_TIME + " INTEGER," +
Mms.DELIVERY_REPORT + " INTEGER," +
Mms.LOCKED + " INTEGER DEFAULT 0," +
- Mms.SUB_ID + " INTEGER DEFAULT -1, " +
+ Mms.SUB_ID + " INTEGER DEFAULT " + SubscriptionManager.INVALID_SUB_ID + ", " +
Mms.SEEN + " INTEGER DEFAULT 0," +
Mms.CREATOR + " TEXT," +
Mms.TEXT_ONLY + " INTEGER DEFAULT 0" +
@@ -837,7 +838,7 @@
"body TEXT," +
"service_center TEXT," +
"locked INTEGER DEFAULT 0," +
- "sub_id INTEGER DEFAULT -1, " +
+ "sub_id INTEGER DEFAULT " + SubscriptionManager.INVALID_SUB_ID + ", " +
"error_code INTEGER DEFAULT 0," +
"creator TEXT," +
"seen INTEGER DEFAULT 0" +
@@ -855,7 +856,7 @@
"sequence INTEGER," + // the part number of this message
"destination_port INTEGER," +
"address TEXT," +
- "sub_id INTEGER DEFAULT -1, " +
+ "sub_id INTEGER DEFAULT " + SubscriptionManager.INVALID_SUB_ID + ", " +
"pdu TEXT);"); // the raw PDU for this part
db.execSQL("CREATE TABLE attachments (" +
@@ -923,7 +924,8 @@
PendingMessages.ERROR_CODE + " INTEGER," +
PendingMessages.RETRY_INDEX + " INTEGER NOT NULL DEFAULT 0," +
PendingMessages.DUE_TIME + " INTEGER," +
- PendingMessages.SUB_ID + " INTEGER DEFAULT 0, " +
+ PendingMessages.SUB_ID + " INTEGER DEFAULT " +
+ SubscriptionManager.INVALID_SUB_ID + ", " +
PendingMessages.LAST_TRY + " INTEGER);");
}
@@ -1531,13 +1533,13 @@
private void upgradeDatabaseToVersion58(SQLiteDatabase db) {
db.execSQL("ALTER TABLE " + MmsProvider.TABLE_PDU +" ADD COLUMN "
- + Mms.SUB_ID + " INTEGER DEFAULT -1");
+ + Mms.SUB_ID + " INTEGER DEFAULT " + SubscriptionManager.INVALID_SUB_ID);
db.execSQL("ALTER TABLE " + MmsSmsProvider.TABLE_PENDING_MSG +" ADD COLUMN "
- + "pending_sub_id" + " INTEGER DEFAULT 0");
+ + "pending_sub_id" + " INTEGER DEFAULT " + SubscriptionManager.INVALID_SUB_ID);
db.execSQL("ALTER TABLE " + SmsProvider.TABLE_SMS +" ADD COLUMN "
- + Sms.SUB_ID + " INTEGER DEFAULT -1");
+ + Sms.SUB_ID + " INTEGER DEFAULT " + SubscriptionManager.INVALID_SUB_ID);
db.execSQL("ALTER TABLE " + SmsProvider.TABLE_RAW +" ADD COLUMN "
- + Sms.SUB_ID + " INTEGER DEFAULT -1");
+ + Sms.SUB_ID + " INTEGER DEFAULT " + SubscriptionManager.INVALID_SUB_ID);
}
private void upgradeDatabaseToVersion59(SQLiteDatabase db) {
@@ -1829,7 +1831,7 @@
Mms.DELIVERY_TIME + " INTEGER," +
Mms.DELIVERY_REPORT + " INTEGER," +
Mms.LOCKED + " INTEGER DEFAULT 0," +
- Mms.SUB_ID + " INTEGER DEFAULT -1," +
+ Mms.SUB_ID + " INTEGER DEFAULT " + SubscriptionManager.INVALID_SUB_ID + ", " +
Mms.SEEN + " INTEGER DEFAULT 0," +
Mms.TEXT_ONLY + " INTEGER DEFAULT 0" +
");");
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index ead4887..1d80317 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -229,17 +229,16 @@
"bearer INTEGER," +
"mvno_type TEXT," +
"mvno_match_data TEXT," +
- "sub_id LONG DEFAULT -1," +
+ "sub_id LONG DEFAULT " + SubscriptionManager.INVALID_SUB_ID + "," +
"profile_id INTEGER default 0," +
"modem_cognitive BOOLEAN default 0," +
"max_conns INTEGER default 0," +
"wait_time INTEGER default 0," +
"max_conns_time INTEGER default 0," +
"mtu INTEGER);");
- /* FIXME Currenlty sub_id is column is not used for query purpose.
- This would be modified to more appropriate default value later. */
if (DBG) log("dbh.createCarriersTable:-");
}
+
private void initDatabase(SQLiteDatabase db) {
if (VDBG) log("dbh.initDatabase:+ db=" + db);
// Read internal APNS data
@@ -338,7 +337,8 @@
}
if (oldVersion < (9 << 16 | 6)) {
db.execSQL("ALTER TABLE " + CARRIERS_TABLE +
- " ADD COLUMN sub_id LONG DEFAULT -1;");
+ " ADD COLUMN sub_id LONG DEFAULT " +
+ SubscriptionManager.INVALID_SUB_ID + ";");
oldVersion = 9 << 16 | 6;
}
if (oldVersion < (10 << 16 | 6)) {
@@ -578,7 +578,7 @@
values.put(Telephony.Carriers.MVNO_MATCH_DATA, "");
}
- long subId = SubscriptionManager.getDefaultSubId();
+ int subId = SubscriptionManager.getDefaultSubId();
if (!values.containsKey(Telephony.Carriers.SUB_ID)) {
values.put(Telephony.Carriers.SUB_ID, subId);
}
@@ -616,7 +616,7 @@
return true;
}
- private void setPreferredApnId(Long id, long subId) {
+ private void setPreferredApnId(Long id, int subId) {
SharedPreferences sp = getContext().getSharedPreferences(
PREF_FILE + subId, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sp.edit();
@@ -624,7 +624,7 @@
editor.apply();
}
- private long getPreferredApnId(long subId) {
+ private long getPreferredApnId(int subId) {
SharedPreferences sp = getContext().getSharedPreferences(
PREF_FILE + subId, Context.MODE_PRIVATE);
return sp.getLong(COLUMN_APN_ID, -1);
@@ -635,7 +635,7 @@
String[] selectionArgs, String sort) {
TelephonyManager mTelephonyManager =
(TelephonyManager)getContext().getSystemService(Context.TELEPHONY_SERVICE);
- long subId = SubscriptionManager.getDefaultSubId();
+ int subId = SubscriptionManager.getDefaultSubId();
String subIdString;
SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
qb.setStrict(true); // a little protection from injection attacks
@@ -646,7 +646,7 @@
case URL_TELEPHONY_USING_SUBID: {
subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
return null;
@@ -665,7 +665,7 @@
case URL_CURRENT_USING_SUBID: {
subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
return null;
@@ -691,7 +691,7 @@
case URL_PREFERAPN_NO_UPDATE_USING_SUBID: {
subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
return null;
@@ -773,7 +773,7 @@
public Uri insert(Uri url, ContentValues initialValues)
{
Uri result = null;
- long subId = SubscriptionManager.getDefaultSubId();
+ int subId = SubscriptionManager.getDefaultSubId();
checkPermission();
@@ -786,7 +786,7 @@
{
String subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
return result;
@@ -821,7 +821,7 @@
{
String subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
return result;
@@ -856,7 +856,7 @@
{
String subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
return result;
@@ -894,7 +894,7 @@
public int delete(Uri url, String where, String[] whereArgs)
{
int count = 0;
- long subId = SubscriptionManager.getDefaultSubId();
+ int subId = SubscriptionManager.getDefaultSubId();
checkPermission();
@@ -906,7 +906,7 @@
{
String subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
throw new IllegalArgumentException("Invalid subId " + url);
@@ -925,7 +925,7 @@
case URL_CURRENT_USING_SUBID: {
String subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
throw new IllegalArgumentException("Invalid subId " + url);
@@ -951,7 +951,7 @@
case URL_RESTOREAPN_USING_SUBID: {
String subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
throw new IllegalArgumentException("Invalid subId " + url);
@@ -969,7 +969,7 @@
case URL_PREFERAPN_NO_UPDATE_USING_SUBID: {
String subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
throw new IllegalArgumentException("Invalid subId " + url);
@@ -1008,7 +1008,7 @@
{
int count = 0;
int uriType = URL_UNKNOWN;
- long subId = SubscriptionManager.getDefaultSubId();
+ int subId = SubscriptionManager.getDefaultSubId();
checkPermission();
@@ -1020,7 +1020,7 @@
{
String subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
throw new IllegalArgumentException("Invalid subId " + url);
@@ -1040,7 +1040,7 @@
{
String subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
throw new IllegalArgumentException("Invalid subId " + url);
@@ -1072,7 +1072,7 @@
{
String subIdString = url.getLastPathSegment();
try {
- subId = Long.parseLong(subIdString);
+ subId = Integer.parseInt(subIdString);
} catch (NumberFormatException e) {
loge("NumberFormatException" + e);
throw new IllegalArgumentException("Invalid subId " + url);
@@ -1144,7 +1144,7 @@
private DatabaseHelper mOpenHelper;
- private void restoreDefaultAPN(long subId) {
+ private void restoreDefaultAPN(int subId) {
SQLiteDatabase db = mOpenHelper.getWritableDatabase();
try {