Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
Test: Presubmit
Bug: 161896447
Merged-In: I6577cf4a1002774179d57ed5edb8023c7677555f
Change-Id: I6577cf4a1002774179d57ed5edb8023c7677555f
(cherry picked from commit f2bd3175c25487634489bd18970dca0cc361b412)
diff --git a/src/com/android/providers/telephony/TelephonyBackupAgent.java b/src/com/android/providers/telephony/TelephonyBackupAgent.java
index 5c764c8..958c929 100644
--- a/src/com/android/providers/telephony/TelephonyBackupAgent.java
+++ b/src/com/android/providers/telephony/TelephonyBackupAgent.java
@@ -1147,9 +1147,9 @@
if (DEBUG) {
Log.d(TAG, "Add mms:\n" + mms);
}
- final long dummyId = System.currentTimeMillis(); // Dummy ID of the msg.
+ final long placeholderId = System.currentTimeMillis(); // Placeholder ID of the msg.
final Uri partUri = Telephony.Mms.CONTENT_URI.buildUpon()
- .appendPath(String.valueOf(dummyId)).appendPath("part").build();
+ .appendPath(String.valueOf(placeholderId)).appendPath("part").build();
final String srcName = String.format(Locale.US, "text.%06d.txt", 0);
{ // Insert SMIL part.
@@ -1157,7 +1157,7 @@
final String smil = TextUtils.isEmpty(mms.smil) ?
String.format(sSmilTextOnly, smilBody) : mms.smil;
final ContentValues values = new ContentValues(7);
- values.put(Telephony.Mms.Part.MSG_ID, dummyId);
+ values.put(Telephony.Mms.Part.MSG_ID, placeholderId);
values.put(Telephony.Mms.Part.SEQ, -1);
values.put(Telephony.Mms.Part.CONTENT_TYPE, ContentType.APP_SMIL);
values.put(Telephony.Mms.Part.NAME, "smil.xml");
@@ -1172,7 +1172,7 @@
{ // Insert body part.
final ContentValues values = new ContentValues(8);
- values.put(Telephony.Mms.Part.MSG_ID, dummyId);
+ values.put(Telephony.Mms.Part.MSG_ID, placeholderId);
values.put(Telephony.Mms.Part.SEQ, 0);
values.put(Telephony.Mms.Part.CONTENT_TYPE, ContentType.TEXT_PLAIN);
values.put(Telephony.Mms.Part.NAME, srcName);
@@ -1194,7 +1194,7 @@
// Insert the attachment parts.
for (ContentValues mmsAttachment : mms.attachments) {
final ContentValues values = new ContentValues(6);
- values.put(Telephony.Mms.Part.MSG_ID, dummyId);
+ values.put(Telephony.Mms.Part.MSG_ID, placeholderId);
values.put(Telephony.Mms.Part.SEQ, 0);
values.put(Telephony.Mms.Part.CONTENT_TYPE,
mmsAttachment.getAsString(MMS_MIME_TYPE));
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index b7d7586..98bc81e 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -774,7 +774,7 @@
confparser.setInput(confreader);
XmlUtils.beginDocument(confparser, "apns");
- // Sanity check. Force internal version and confidential versions to agree
+ // Correctness check. Force internal version and confidential versions to agree
int confversion = Integer.parseInt(confparser.getAttributeValue(null, "version"));
if (publicversion != confversion) {
log("initDatabase: throwing exception due to version mismatch");
diff --git a/tests/src/com/android/providers/telephony/CarrierIdProviderTest.java b/tests/src/com/android/providers/telephony/CarrierIdProviderTest.java
index ee0e016..921b59c 100644
--- a/tests/src/com/android/providers/telephony/CarrierIdProviderTest.java
+++ b/tests/src/com/android/providers/telephony/CarrierIdProviderTest.java
@@ -58,18 +58,18 @@
private static final String TAG = CarrierIdProviderTest.class.getSimpleName();
- private static final String dummy_mccmnc = "MCCMNC_DUMMY";
- private static final String dummy_gid1 = "GID1_DUMMY";
- private static final String dummy_gid2 = "GID2_DUMMY";
- private static final String dummy_plmn = "PLMN_DUMMY";
- private static final String dummy_imsi_prefix = "IMSI_PREFIX_DUMMY";
- private static final String dummy_spn = "SPN_DUMMY";
- private static final String dummy_apn = "APN_DUMMY";
- private static final String dummy_iccid_prefix = "ICCID_PREFIX_DUMMY";
- private static final String dummy_name = "NAME_DUMMY";
- private static final String dummy_access_rule =
+ private static final String test_mccmnc = "MCCMNC_TEST";
+ private static final String test_gid1 = "GID1_TEST";
+ private static final String test_gid2 = "GID2_TEST";
+ private static final String test_plmn = "PLMN_TEST";
+ private static final String test_imsi_prefix = "IMSI_PREFIX_TEST";
+ private static final String test_spn = "SPN_TEST";
+ private static final String test_apn = "APN_TEST";
+ private static final String test_iccid_prefix = "ICCID_PREFIX_TEST";
+ private static final String test_name = "NAME_TEST";
+ private static final String test_access_rule =
"B9CFCE1C47A6AC713442718F15EF55B00B3A6D1A6D48CB46249FA8EB51465350";
- private static final int dummy_cid = 0;
+ private static final int test_cid = 0;
private MockContextWithProvider mContext;
private MockContentResolver mContentResolver;
@@ -204,7 +204,7 @@
try {
//insert a row with null mnccmnc to break not null constraint
ContentValues contentValues = new ContentValues();
- contentValues.put(CarrierId.All.GID1, dummy_gid1);
+ contentValues.put(CarrierId.All.GID1, test_gid1);
mContentResolver.insert(CarrierId.All.CONTENT_URI, contentValues);
Assert.fail("should throw an exception for null mccmnc");
} catch (SQLException e) {
@@ -227,7 +227,7 @@
int numRowsDeleted = -1;
try {
String whereClause = CarrierId.All.MCCMNC + "=?";
- String[] whereArgs = new String[] { dummy_mccmnc };
+ String[] whereArgs = new String[] { test_mccmnc };
numRowsDeleted = mContentResolver.delete(CarrierId.All.CONTENT_URI,
whereClause, whereArgs);
} catch (Exception e) {
@@ -254,7 +254,7 @@
try {
contentValues.put(CarrierId.CARRIER_ID, 1);
mContentResolver.update(CarrierId.All.CONTENT_URI, contentValues,
- CarrierId.All.MCCMNC + "=?", new String[] { dummy_mccmnc });
+ CarrierId.All.MCCMNC + "=?", new String[] { test_mccmnc });
} catch (Exception e) {
Log.d(TAG, "Error updating values:" + e);
}
@@ -262,7 +262,7 @@
try {
Cursor findEntry = mContentResolver.query(CarrierId.All.CONTENT_URI,
new String[] { CarrierId.CARRIER_ID},
- CarrierId.All.MCCMNC + "=?", new String[] { dummy_mccmnc },
+ CarrierId.All.MCCMNC + "=?", new String[] { test_mccmnc },
null);
findEntry.moveToFirst();
cid = findEntry.getInt(0);
@@ -282,7 +282,7 @@
mContentResolver.insert(CarrierId.All.CONTENT_URI, contentValues);
// insert its MNO
contentValues = new ContentValues();
- contentValues.put(CarrierId.All.MCCMNC, dummy_mccmnc);
+ contentValues.put(CarrierId.All.MCCMNC, test_mccmnc);
contentValues.put(CarrierId.CARRIER_ID, 1);
mContentResolver.insert(CarrierId.All.CONTENT_URI, contentValues);
} catch (Exception e) {
@@ -293,7 +293,7 @@
String[] columns = {CarrierId.CARRIER_ID, CarrierId.All.ICCID_PREFIX};
try {
findEntry = mContentResolver.query(CarrierId.All.CONTENT_URI, columns,
- CarrierId.All.MCCMNC + "=?", new String[] { dummy_mccmnc },
+ CarrierId.All.MCCMNC + "=?", new String[] { test_mccmnc },
null);
} catch (Exception e) {
Log.d(TAG, "Query failed:" + e);
@@ -306,14 +306,14 @@
CarrierId.All.MCCMNC + "=? and "
+ CarrierId.All.GID1 + "=? and "
+ CarrierId.All.ICCID_PREFIX + "=?",
- new String[] { dummy_mccmnc, dummy_gid1, dummy_iccid_prefix }, null);
+ new String[] { test_mccmnc, test_gid1, test_iccid_prefix }, null);
} catch (Exception e) {
Log.d(TAG, "Query failed:" + e);
}
assertEquals(1, findEntry.getCount());
findEntry.moveToFirst();
- assertEquals(dummy_cid, findEntry.getInt(0));
- assertEquals(dummy_iccid_prefix, findEntry.getString(1));
+ assertEquals(test_cid, findEntry.getInt(0));
+ assertEquals(test_iccid_prefix, findEntry.getString(1));
}
@Test
@@ -337,8 +337,8 @@
// update carrier id for subId 1
try {
ContentValues cv = new ContentValues();
- cv.put(CarrierId.CARRIER_ID, dummy_cid);
- cv.put(CarrierId.CARRIER_NAME, dummy_name);
+ cv.put(CarrierId.CARRIER_ID, test_cid);
+ cv.put(CarrierId.CARRIER_NAME, test_name);
when(subscriptionManager.isActiveSubscriptionId(eq(1))).thenReturn(true);
mContext.getContentResolver().update(Uri.withAppendedPath(CarrierId.CONTENT_URI,
"1"), cv, null, null);
@@ -359,8 +359,8 @@
} catch (Exception e) {
Log.d(TAG, "Error query current subscription: " + e);
}
- assertEquals(dummy_cid, carrierId);
- assertEquals(dummy_name, carrierName);
+ assertEquals(test_cid, carrierId);
+ assertEquals(test_name, carrierName);
// query carrier id for subId 2
int count = -1;
@@ -384,8 +384,8 @@
} catch (Exception e) {
Log.d(TAG, "Error query current subscription: " + e);
}
- assertEquals(dummy_cid, carrierId);
- assertEquals(dummy_name, carrierName);
+ assertEquals(test_cid, carrierId);
+ assertEquals(test_name, carrierName);
}
@Test(expected = IllegalArgumentException.class)
@@ -410,8 +410,8 @@
public void testUpdateCurrentSubscription_WrongURI() {
try {
ContentValues cv = new ContentValues();
- cv.put(CarrierId.CARRIER_ID, dummy_cid);
- cv.put(CarrierId.CARRIER_NAME, dummy_name);
+ cv.put(CarrierId.CARRIER_ID, test_cid);
+ cv.put(CarrierId.CARRIER_NAME, test_name);
mContext.getContentResolver().update(CarrierId.CONTENT_URI, cv, null, null);
Assert.fail("should throw an exception for wrong uri");
} catch (IllegalArgumentException ex) {
@@ -421,17 +421,17 @@
private static ContentValues createCarrierInfoInternal() {
ContentValues contentValues = new ContentValues();
- contentValues.put(CarrierId.All.MCCMNC, dummy_mccmnc);
- contentValues.put(CarrierId.All.GID1, dummy_gid1);
- contentValues.put(CarrierId.All.GID2, dummy_gid2);
- contentValues.put(CarrierId.All.PLMN, dummy_plmn);
- contentValues.put(CarrierId.All.IMSI_PREFIX_XPATTERN, dummy_imsi_prefix);
- contentValues.put(CarrierId.All.SPN, dummy_spn);
- contentValues.put(CarrierId.All.APN, dummy_apn);
- contentValues.put(CarrierId.All.ICCID_PREFIX, dummy_iccid_prefix);
- contentValues.put(CarrierId.CARRIER_NAME, dummy_name);
- contentValues.put(CarrierId.CARRIER_ID, dummy_cid);
- contentValues.put(CarrierId.All.PRIVILEGE_ACCESS_RULE, dummy_access_rule);
+ contentValues.put(CarrierId.All.MCCMNC, test_mccmnc);
+ contentValues.put(CarrierId.All.GID1, test_gid1);
+ contentValues.put(CarrierId.All.GID2, test_gid2);
+ contentValues.put(CarrierId.All.PLMN, test_plmn);
+ contentValues.put(CarrierId.All.IMSI_PREFIX_XPATTERN, test_imsi_prefix);
+ contentValues.put(CarrierId.All.SPN, test_spn);
+ contentValues.put(CarrierId.All.APN, test_apn);
+ contentValues.put(CarrierId.All.ICCID_PREFIX, test_iccid_prefix);
+ contentValues.put(CarrierId.CARRIER_NAME, test_name);
+ contentValues.put(CarrierId.CARRIER_ID, test_cid);
+ contentValues.put(CarrierId.All.PRIVILEGE_ACCESS_RULE, test_access_rule);
return contentValues;
}
}
diff --git a/tests/src/com/android/providers/telephony/CarrierProviderTest.java b/tests/src/com/android/providers/telephony/CarrierProviderTest.java
index 5146aa9..eb95fb6 100644
--- a/tests/src/com/android/providers/telephony/CarrierProviderTest.java
+++ b/tests/src/com/android/providers/telephony/CarrierProviderTest.java
@@ -54,16 +54,16 @@
private MockContentResolver mContentResolver;
private CarrierProviderTestable mCarrierProviderTestable;
- public static final int dummy_type = 1;
- public static final String dummy_mnc = "MNC001";
- public static final String dummy_mnc2 = "MNC002";
- public static final String dummy_mcc = "MCC005";
- public static final String dummy_key1 = "PUBKEY1";
- public static final String dummy_key2 = "PUBKEY2";
- public static final String dummy_mvno_type = "100";
- public static final String dummy_mvno_match_data = "101";
- public static final String dummy_key_identifier_data = "key_identifier1";
- public static final long dummy_key_expiration = 1496795015L;
+ public static final int test_type = 1;
+ public static final String test_mnc = "MNC001";
+ public static final String test_mnc2 = "MNC002";
+ public static final String test_mcc = "MCC005";
+ public static final String test_key1 = "PUBKEY1";
+ public static final String test_key2 = "PUBKEY2";
+ public static final String test_mvno_type = "100";
+ public static final String test_mvno_match_data = "101";
+ public static final String test_key_identifier_data = "key_identifier1";
+ public static final long test_key_expiration = 1496795015L;
/**
@@ -144,14 +144,14 @@
public void testInsertCertificates() {
int count = -1;
ContentValues contentValues = new ContentValues();
- contentValues.put(CarrierDatabaseHelper.KEY_TYPE, dummy_type);
- contentValues.put(CarrierDatabaseHelper.MCC, dummy_mcc);
- contentValues.put(CarrierDatabaseHelper.MNC, dummy_mnc);
- contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
- contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, dummy_key_identifier_data);
- contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key1.getBytes());
- contentValues.put(CarrierDatabaseHelper.EXPIRATION_TIME, dummy_key_expiration);
+ contentValues.put(CarrierDatabaseHelper.KEY_TYPE, test_type);
+ contentValues.put(CarrierDatabaseHelper.MCC, test_mcc);
+ contentValues.put(CarrierDatabaseHelper.MNC, test_mnc);
+ contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, test_mvno_type);
+ contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, test_mvno_match_data);
+ contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, test_key_identifier_data);
+ contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, test_key1.getBytes());
+ contentValues.put(CarrierDatabaseHelper.EXPIRATION_TIME, test_key_expiration);
try {
mContentResolver.insert(CarrierProvider.CONTENT_URI, contentValues);
@@ -180,14 +180,14 @@
public void testUpdateCertificates() {
String key = null;
ContentValues contentValues = new ContentValues();
- contentValues.put(CarrierDatabaseHelper.KEY_TYPE, dummy_type);
- contentValues.put(CarrierDatabaseHelper.MCC, dummy_mcc);
- contentValues.put(CarrierDatabaseHelper.MNC, dummy_mnc);
- contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
- contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, dummy_key_identifier_data);
- contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key1.getBytes());
- contentValues.put(CarrierDatabaseHelper.EXPIRATION_TIME, dummy_key_expiration);
+ contentValues.put(CarrierDatabaseHelper.KEY_TYPE, test_type);
+ contentValues.put(CarrierDatabaseHelper.MCC, test_mcc);
+ contentValues.put(CarrierDatabaseHelper.MNC, test_mnc);
+ contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, test_mvno_type);
+ contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, test_mvno_match_data);
+ contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, test_key_identifier_data);
+ contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, test_key1.getBytes());
+ contentValues.put(CarrierDatabaseHelper.EXPIRATION_TIME, test_key_expiration);
try {
mContentResolver.insert(CarrierProvider.CONTENT_URI, contentValues);
@@ -197,10 +197,10 @@
try {
ContentValues updatedValues = new ContentValues();
- updatedValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key2);
+ updatedValues.put(CarrierDatabaseHelper.PUBLIC_KEY, test_key2);
mContentResolver.update(CarrierProvider.CONTENT_URI, updatedValues,
- "mcc=? and mnc=? and key_type=?", new String[] { dummy_mcc, dummy_mnc,
- String.valueOf(dummy_type) });
+ "mcc=? and mnc=? and key_type=?", new String[] { test_mcc, test_mnc,
+ String.valueOf(test_type) });
} catch (Exception e) {
Log.d(TAG, "Error updating values:" + e);
}
@@ -209,13 +209,13 @@
String[] columns ={CarrierDatabaseHelper.PUBLIC_KEY};
Cursor findEntry = mContentResolver.query(CarrierProvider.CONTENT_URI, columns,
"mcc=? and mnc=? and key_type=?",
- new String[] { dummy_mcc, dummy_mnc, String.valueOf(dummy_type) }, null);
+ new String[] { test_mcc, test_mnc, String.valueOf(test_type) }, null);
findEntry.moveToFirst();
key = findEntry.getString(0);
} catch (Exception e) {
Log.d(TAG, "Query failed:" + e);
}
- assertEquals(key, dummy_key2);
+ assertEquals(key, test_key2);
}
/**
@@ -226,22 +226,22 @@
public void testMultipleCertificates() {
int count = -1;
ContentValues contentValues = new ContentValues();
- contentValues.put(CarrierDatabaseHelper.KEY_TYPE, dummy_type);
- contentValues.put(CarrierDatabaseHelper.MCC, dummy_mcc);
- contentValues.put(CarrierDatabaseHelper.MNC, dummy_mnc);
- contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
- contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, dummy_key_identifier_data);
- contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key1.getBytes());
+ contentValues.put(CarrierDatabaseHelper.KEY_TYPE, test_type);
+ contentValues.put(CarrierDatabaseHelper.MCC, test_mcc);
+ contentValues.put(CarrierDatabaseHelper.MNC, test_mnc);
+ contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, test_mvno_type);
+ contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, test_mvno_match_data);
+ contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, test_key_identifier_data);
+ contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, test_key1.getBytes());
ContentValues contentValuesNew = new ContentValues();
- contentValuesNew.put(CarrierDatabaseHelper.KEY_TYPE, dummy_type);
- contentValuesNew.put(CarrierDatabaseHelper.MCC, dummy_mcc);
- contentValuesNew.put(CarrierDatabaseHelper.MNC, dummy_mnc2);
- contentValuesNew.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
- contentValuesNew.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, dummy_key_identifier_data);
- contentValuesNew.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key2.getBytes());
+ contentValuesNew.put(CarrierDatabaseHelper.KEY_TYPE, test_type);
+ contentValuesNew.put(CarrierDatabaseHelper.MCC, test_mcc);
+ contentValuesNew.put(CarrierDatabaseHelper.MNC, test_mnc2);
+ contentValuesNew.put(CarrierDatabaseHelper.MVNO_TYPE, test_mvno_type);
+ contentValuesNew.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, test_mvno_match_data);
+ contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, test_key_identifier_data);
+ contentValuesNew.put(CarrierDatabaseHelper.PUBLIC_KEY, test_key2.getBytes());
try {
mContentResolver.insert(CarrierProvider.CONTENT_URI, contentValues);
@@ -270,12 +270,12 @@
@Test(expected = SQLException.class)
public void testDuplicateFailure() {
ContentValues contentValues = new ContentValues();
- contentValues.put(CarrierDatabaseHelper.KEY_TYPE, dummy_type);
- contentValues.put(CarrierDatabaseHelper.MCC, dummy_mcc);
- contentValues.put(CarrierDatabaseHelper.MNC, dummy_mnc);
- contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
- contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key1.getBytes());
+ contentValues.put(CarrierDatabaseHelper.KEY_TYPE, test_type);
+ contentValues.put(CarrierDatabaseHelper.MCC, test_mcc);
+ contentValues.put(CarrierDatabaseHelper.MNC, test_mnc);
+ contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, test_mvno_type);
+ contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, test_mvno_match_data);
+ contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, test_key1.getBytes());
try {
mContentResolver.insert(CarrierProvider.CONTENT_URI, contentValues);
@@ -297,14 +297,14 @@
public void testDelete() {
int numRowsDeleted = -1;
ContentValues contentValues = new ContentValues();
- contentValues.put(CarrierDatabaseHelper.KEY_TYPE, dummy_type);
- contentValues.put(CarrierDatabaseHelper.MCC, dummy_mcc);
- contentValues.put(CarrierDatabaseHelper.MNC, dummy_mnc);
- contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
- contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, dummy_key_identifier_data);
- contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key1.getBytes());
- contentValues.put(CarrierDatabaseHelper.EXPIRATION_TIME, dummy_key_expiration);
+ contentValues.put(CarrierDatabaseHelper.KEY_TYPE, test_type);
+ contentValues.put(CarrierDatabaseHelper.MCC, test_mcc);
+ contentValues.put(CarrierDatabaseHelper.MNC, test_mnc);
+ contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, test_mvno_type);
+ contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, test_mvno_match_data);
+ contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, test_key_identifier_data);
+ contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, test_key1.getBytes());
+ contentValues.put(CarrierDatabaseHelper.EXPIRATION_TIME, test_key_expiration);
try {
mContentResolver.insert(CarrierProvider.CONTENT_URI, contentValues);
@@ -314,7 +314,7 @@
try {
String whereClause = "mcc=? and mnc=?";
- String[] whereArgs = new String[] { dummy_mcc, dummy_mnc };
+ String[] whereArgs = new String[] { test_mcc, test_mnc };
numRowsDeleted = mContentResolver.delete(CarrierProvider.CONTENT_URI, whereClause, whereArgs);
} catch (Exception e) {
Log.d(TAG, "Error updating values:" + e);
diff --git a/tests/src/com/android/providers/telephony/TelephonyBackupAgentTest.java b/tests/src/com/android/providers/telephony/TelephonyBackupAgentTest.java
index b1cd5e4..643a18f 100644
--- a/tests/src/com/android/providers/telephony/TelephonyBackupAgentTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyBackupAgentTest.java
@@ -41,7 +41,6 @@
import android.util.ArraySet;
import android.util.JsonReader;
import android.util.JsonWriter;
-import android.util.Log;
import android.util.SparseArray;
import libcore.io.IoUtils;
@@ -800,7 +799,7 @@
private class FakeMmsProvider extends MockContentProvider {
private int nextRow = 0;
private List<ContentValues> mValues;
- private long mDummyMsgId = -1;
+ private long mPlaceholderMsgId = -1;
private long mMsgId = -1;
private String mFilename;
@@ -810,7 +809,7 @@
@Override
public Uri insert(Uri uri, ContentValues values) {
- Uri retUri = Uri.parse("dummy_uri");
+ Uri retUri = Uri.parse("test_uri");
ContentValues modifiedValues = new ContentValues(mValues.get(nextRow++));
if (values.containsKey("read")) {
assertEquals("read: ", modifiedValues.get("read"), values.get("read"));
@@ -820,8 +819,8 @@
}
if (APP_SMIL.equals(values.get(Telephony.Mms.Part.CONTENT_TYPE))) {
// Smil part.
- assertEquals(-1, mDummyMsgId);
- mDummyMsgId = values.getAsLong(Telephony.Mms.Part.MSG_ID);
+ assertEquals(-1, mPlaceholderMsgId);
+ mPlaceholderMsgId = values.getAsLong(Telephony.Mms.Part.MSG_ID);
}
if (IMAGE_JPG.equals(values.get(Telephony.Mms.Part.CONTENT_TYPE))) {
// Image attachment part.
@@ -839,7 +838,7 @@
if (values.get(Telephony.Mms.Part.SEQ) != null) {
// Part of mms.
final Uri expectedUri = Telephony.Mms.CONTENT_URI.buildUpon()
- .appendPath(String.valueOf(mDummyMsgId))
+ .appendPath(String.valueOf(mPlaceholderMsgId))
.appendPath("part")
.build();
assertEquals(expectedUri, uri);
@@ -852,7 +851,7 @@
}
if (values.get(Telephony.Mms.Part.MSG_ID) != null) {
- modifiedValues.put(Telephony.Mms.Part.MSG_ID, mDummyMsgId);
+ modifiedValues.put(Telephony.Mms.Part.MSG_ID, mPlaceholderMsgId);
}
if (values.containsKey("read")) {
assertEquals("read: ", modifiedValues.get("read"), values.get("read"));
@@ -890,7 +889,7 @@
assertEquals(expectedUri, uri);
assertNotSame(-1, mMsgId);
modifiedValues.put(Telephony.Mms.Addr.MSG_ID, mMsgId);
- mDummyMsgId = -1;
+ mPlaceholderMsgId = -1;
}
if (values.containsKey("read")) {
assertEquals("read: ", modifiedValues.get("read"), values.get("read"));
@@ -909,7 +908,7 @@
@Override
public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
final Uri expectedUri = Telephony.Mms.CONTENT_URI.buildUpon()
- .appendPath(String.valueOf(mDummyMsgId))
+ .appendPath(String.valueOf(mPlaceholderMsgId))
.appendPath("part")
.build();
assertEquals(expectedUri, uri);