Merge "Add user handle in SimInfo database."
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index ce76521..18aa8b9 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -161,7 +161,7 @@
private static final boolean DBG = true;
private static final boolean VDBG = false; // STOPSHIP if true
- private static final int DATABASE_VERSION = 58 << 16;
+ private static final int DATABASE_VERSION = 59 << 16;
private static final int URL_UNKNOWN = 0;
private static final int URL_TELEPHONY = 1;
private static final int URL_CURRENT = 2;
@@ -583,7 +583,8 @@
+ Telephony.SimInfo.COLUMN_USAGE_SETTING + " INTEGER DEFAULT "
+ SubscriptionManager.USAGE_SETTING_UNKNOWN + ","
+ Telephony.SimInfo.COLUMN_TP_MESSAGE_REF +
- " INTEGER DEFAULT -1"
+ " INTEGER DEFAULT -1,"
+ + Telephony.SimInfo.COLUMN_USER_HANDLE + " INTEGER DEFAULT -1"
+ ");";
}
@@ -1825,6 +1826,21 @@
}
oldVersion = 58 << 16 | 6;
}
+
+ if (oldVersion < (59 << 16 | 6)) {
+ try {
+ // Try to update the siminfo table with new columns.
+ db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
+ + Telephony.SimInfo.COLUMN_USER_HANDLE
+ + " INTEGER DEFAULT -1;");
+ } catch (SQLiteException e) {
+ if (DBG) {
+ log("onUpgrade failed to update " + SIMINFO_TABLE
+ + " to add message Reference. ");
+ }
+ }
+ oldVersion = 59 << 16 | 6;
+ }
if (DBG) {
log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
}
@@ -3651,7 +3667,7 @@
PersistableBundle backedUpSimInfoEntry, int backupDataFormatVersion,
String isoCountryCodeFromDb,
List<String> wfcRestoreBlockedCountries) {
- if (DATABASE_VERSION != 58 << 16) {
+ if (DATABASE_VERSION != 59 << 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 "
diff --git a/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java b/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
index 993c17c..b4a319c 100644
--- a/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
@@ -368,6 +368,23 @@
Telephony.SimInfo.COLUMN_USAGE_SETTING));
}
+ @Test
+ public void databaseHelperOnUpgrade_hasUserHandleField() {
+ Log.d(TAG, "databaseHelperOnUpgrade_hasUserHandleField");
+ // (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
+ // Telephony.SimInfo.COLUMN_USER_HANDLE
+ 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_USER_HANDLE));
+ }
+
/**
* 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 a546360..7269186 100644
--- a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
@@ -714,6 +714,7 @@
final String insertCardId = "exampleCardId";
final int insertProfileClass = SubscriptionManager.PROFILE_CLASS_DEFAULT;
final int insertPortIndex = 1;
+ final int insertUserHandle = 0;
contentValues.put(SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID, insertSubId);
contentValues.put(SubscriptionManager.DISPLAY_NAME, insertDisplayName);
contentValues.put(SubscriptionManager.CARRIER_NAME, insertCarrierName);
@@ -721,6 +722,7 @@
contentValues.put(SubscriptionManager.CARD_ID, insertCardId);
contentValues.put(SubscriptionManager.PROFILE_CLASS, insertProfileClass);
contentValues.put(SubscriptionManager.PORT_INDEX, insertPortIndex);
+ contentValues.put(SubscriptionManager.USER_HANDLE, insertUserHandle);
Log.d(TAG, "testSimTable Inserting contentValues: " + contentValues);
mContentResolver.insert(SimInfo.CONTENT_URI, contentValues);
@@ -733,6 +735,7 @@
SubscriptionManager.CARD_ID,
SubscriptionManager.PROFILE_CLASS,
SubscriptionManager.PORT_INDEX,
+ SubscriptionManager.USER_HANDLE,
};
final String selection = SubscriptionManager.DISPLAY_NAME + "=?";
String[] selectionArgs = { insertDisplayName };
@@ -750,10 +753,12 @@
final String resultCardId = cursor.getString(2);
final int resultProfileClass = cursor.getInt(3);
final int resultPortIndex = cursor.getInt(4);
+ final int resultUserHandle = cursor.getInt(5);
assertEquals(insertSubId, resultSubId);
assertEquals(insertCarrierName, resultCarrierName);
assertEquals(insertCardId, resultCardId);
assertEquals(insertPortIndex, resultPortIndex);
+ assertEquals(insertUserHandle, resultUserHandle);
// delete test content
final String selectionToDelete = SubscriptionManager.DISPLAY_NAME + "=?";
