Snap for 7924855 from 032afc33295c8acac3ddab838b6ca1a4949450b1 to sc-v2-release
Change-Id: I50e40257ca95ecbf0e9e60b8dbdc500161e72177
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 0638461..c0faeee 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -3360,10 +3360,11 @@
}
if (bestRestoreMatch != null) {
- if (bestRestoreMatch.getMatchScore() != 0) {
+ ContentValues newContentValues = bestRestoreMatch.getContentValues();
+ if (bestRestoreMatch.getMatchScore() != 0 && newContentValues != null) {
if (restoreCase == TelephonyProtoEnums.SIM_RESTORE_CASE_SUW) {
update(SubscriptionManager.SIM_INFO_SUW_RESTORE_CONTENT_URI,
- bestRestoreMatch.getContentValues(),
+ newContentValues,
Telephony.SimInfo.COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID + "=?",
new String[]{Integer.toString(currSubIdFromDb)});
} else if (restoreCase == TelephonyProtoEnums.SIM_RESTORE_CASE_SIM_INSERTED) {
@@ -3371,7 +3372,7 @@
SubscriptionManager.SIM_INFO_BACKUP_AND_RESTORE_CONTENT_URI,
SIM_INSERTED_RESTORE_URI_SUFFIX);
update(simInsertedRestoreUri,
- bestRestoreMatch.getContentValues(),
+ newContentValues,
Telephony.SimInfo.COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID + "=?",
new String[]{Integer.toString(currSubIdFromDb)});
}
@@ -3382,6 +3383,9 @@
restoreCase, bestRestoreMatch.getMatchingCriteriaForLogging());
newlyRestoredSubIds.add(currSubIdFromDb);
} else {
+ /* If this block was reached because ContentValues was null, that means the
+ database schema was newer during backup than during restore. We consider this
+ a no-match to avoid updating columns that don't exist */
TelephonyStatsLog.write(TelephonyStatsLog.SIM_SPECIFIC_SETTINGS_RESTORED,
TelephonyProtoEnums.SIM_RESTORE_RESULT_NONE_MATCH,
restoreCase, bestRestoreMatch.getMatchingCriteriaForLogging());