Add D2D sharing status column in database.
Test: Unit test, cts test
Bug: 163085177
Change-Id: I98f6f506897c9f46e33583cea00dc8d96b07333b
Merged-In: I98f6f506897c9f46e33583cea00dc8d96b07333b
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index cffc546..7d4bc6f 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -69,21 +69,17 @@
import static android.provider.Telephony.Carriers.USER_VISIBLE;
import static android.provider.Telephony.Carriers.WAIT_TIME_RETRY;
import static android.provider.Telephony.Carriers._ID;
-import static java.nio.charset.StandardCharsets.UTF_8;
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.annotation.RequiresPermission;
import android.app.compat.CompatChanges;
import android.content.ComponentName;
import android.content.ContentProvider;
-import android.content.ContentProviderOperation;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
-import android.content.OperationApplicationException;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.content.UriMatcher;
@@ -129,7 +125,6 @@
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -139,11 +134,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.lang.Integer;
-import java.lang.NoSuchFieldException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -161,7 +154,7 @@
private static final boolean DBG = true;
private static final boolean VDBG = false; // STOPSHIP if true
- private static final int DATABASE_VERSION = 49 << 16;
+ private static final int DATABASE_VERSION = 50 << 16;
private static final int URL_UNKNOWN = 0;
private static final int URL_TELEPHONY = 1;
private static final int URL_CURRENT = 2;
@@ -399,6 +392,8 @@
Telephony.SimInfo.COLUMN_ENHANCED_4G_MODE_ENABLED, Cursor.FIELD_TYPE_INTEGER);
SIM_INFO_COLUMNS_TO_BACKUP.put(
Telephony.SimInfo.COLUMN_VT_IMS_ENABLED, Cursor.FIELD_TYPE_INTEGER);
+ SIM_INFO_COLUMNS_TO_BACKUP.put(
+ Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING, Cursor.FIELD_TYPE_INTEGER);
}
@VisibleForTesting
@@ -521,7 +516,8 @@
+ Telephony.SimInfo.COLUMN_CROSS_SIM_CALLING_ENABLED + " INTEGER DEFAULT 0,"
+ Telephony.SimInfo.COLUMN_RCS_CONFIG + " BLOB,"
+ Telephony.SimInfo.COLUMN_ALLOWED_NETWORK_TYPES_FOR_REASONS + " TEXT,"
- + Telephony.SimInfo.COLUMN_VOIMS_OPT_IN_STATUS + " INTEGER DEFAULT 0"
+ + Telephony.SimInfo.COLUMN_VOIMS_OPT_IN_STATUS + " INTEGER DEFAULT 0,"
+ + Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING + " INTEGER DEFAULT 0"
+ ");";
}
@@ -1609,12 +1605,27 @@
+ " INTEGER DEFAULT 0;");
} catch (SQLiteException e) {
if (DBG) {
- log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
- "The table will get created in onOpen.");
+ log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. "
+ + "The table will get created in onOpen.");
}
}
oldVersion = 49 << 16 | 6;
}
+
+ if (oldVersion < (50 << 16 | 6)) {
+ try {
+ // Try to update the siminfo table. It might not be there.
+ db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
+ + Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING
+ + " INTEGER DEFAULT 0;");
+ } catch (SQLiteException e) {
+ if (DBG) {
+ log("onUpgrade failed to updated " + SIMINFO_TABLE
+ + " to add d2d status sharing column. ");
+ }
+ }
+ oldVersion = 50 << 16 | 6;
+ }
if (DBG) {
log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
}
@@ -3388,7 +3399,7 @@
private ContentValues convertBackedUpDataToContentValues(
PersistableBundle backedUpSimInfoEntry, int backupDataFormatVersion) {
- if (DATABASE_VERSION != 49 << 16) {
+ if (DATABASE_VERSION != 50 << 16) {
throw new AssertionError("The database schema has been updated which might make "
+ "the format of #BACKED_UP_SIM_SPECIFIC_SETTINGS_FILE outdated. Make sure to "
+ "1) review whether any of the columns in #SIM_INFO_COLUMNS_TO_BACKUP have "
@@ -3441,6 +3452,10 @@
backedUpSimInfoEntry.getInt(
Telephony.SimInfo.COLUMN_VT_IMS_ENABLED,
DEFAULT_INT_COLUMN_VALUE));
+ contentValues.put(Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING,
+ backedUpSimInfoEntry.getInt(
+ Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING,
+ DEFAULT_INT_COLUMN_VALUE));
return polishContentValues(contentValues);
}
diff --git a/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java b/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
index c5294d1..d75211d 100644
--- a/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
@@ -233,6 +233,22 @@
Telephony.SimInfo.COLUMN_VOIMS_OPT_IN_STATUS));
}
+ @Test
+ public void databaseHelperOnUpgrade_hasD2DStatusSharingField() {
+ Log.d(TAG, "databaseHelperOnUpgrade_hasD2DStatusSharingField");
+ // (5 << 16 | 6) is the first upgrade trigger in onUpgrade
+ SQLiteDatabase db = mInMemoryDbHelper.getWritableDatabase();
+ mHelper.onUpgrade(db, (4 << 16), TelephonyProvider.getVersion(mContext));
+
+ // the upgraded db must have the Telephony.SimInfo.COLUMN_D2D_SHARING_STATUS field
+ Cursor cursor = db.query("siminfo", null, null, null, null, null, null);
+ String[] upgradedColumns = cursor.getColumnNames();
+ Log.d(TAG, "siminfo columns: " + Arrays.toString(upgradedColumns));
+
+ assertTrue(Arrays.asList(upgradedColumns).contains(
+ Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING));
+ }
+
/**
* Helper for an in memory DB used to test the TelephonyProvider#DatabaseHelper.
*
diff --git a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
index 46e9fd1..826f51a 100644
--- a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
@@ -162,6 +162,8 @@
ARBITRARY_SIMINFO_DB_TEST_INT_VALUE);
TEST_SIM_INFO_VALUES.put(Telephony.SimInfo.COLUMN_IMS_RCS_UCE_ENABLED,
ARBITRARY_SIMINFO_DB_TEST_INT_VALUE);
+ TEST_SIM_INFO_VALUES.put(SimInfo.COLUMN_D2D_STATUS_SHARING,
+ ARBITRARY_SIMINFO_DB_TEST_INT_VALUE);
BACKED_UP_SIM_INFO_VALUES_WITH_MATCHING_ICCID.put(
Telephony.SimInfo.COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID,
@@ -182,6 +184,9 @@
BACKED_UP_SIM_INFO_VALUES_WITH_MATCHING_ICCID.put(
Telephony.SimInfo.COLUMN_IMS_RCS_UCE_ENABLED,
ARBITRARY_SIMINFO_DB_TEST_INT_VALUE_1);
+ BACKED_UP_SIM_INFO_VALUES_WITH_MATCHING_ICCID.put(
+ SimInfo.COLUMN_D2D_STATUS_SHARING,
+ ARBITRARY_SIMINFO_DB_TEST_INT_VALUE);
BACKED_UP_SIM_INFO_VALUES_WITH_MATCHING_NUMBER_AND_CID.put(
Telephony.SimInfo.COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID,
@@ -202,6 +207,9 @@
BACKED_UP_SIM_INFO_VALUES_WITH_MATCHING_NUMBER_AND_CID.put(
Telephony.SimInfo.COLUMN_IMS_RCS_UCE_ENABLED,
ARBITRARY_SIMINFO_DB_TEST_INT_VALUE_2);
+ BACKED_UP_SIM_INFO_VALUES_WITH_MATCHING_NUMBER_AND_CID.put(
+ SimInfo.COLUMN_D2D_STATUS_SHARING,
+ ARBITRARY_SIMINFO_DB_TEST_INT_VALUE_2);
BACKED_UP_SIM_INFO_VALUES_WITH_MATCHING_CID.put(
Telephony.SimInfo.COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID,
@@ -222,6 +230,9 @@
BACKED_UP_SIM_INFO_VALUES_WITH_MATCHING_CID.put(
Telephony.SimInfo.COLUMN_IMS_RCS_UCE_ENABLED,
ARBITRARY_SIMINFO_DB_TEST_INT_VALUE_3);
+ BACKED_UP_SIM_INFO_VALUES_WITH_MATCHING_CID.put(
+ SimInfo.COLUMN_D2D_STATUS_SHARING,
+ ARBITRARY_SIMINFO_DB_TEST_INT_VALUE_3);
}
/**