Add new column user_editable to Carriers table in telephony db.
am: 460d703c02
Change-Id: I81dc41c7da7f9569b29c076f170b9094293ac627
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index cef4fdb..2314bc8 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -54,6 +54,7 @@
import static android.provider.Telephony.Carriers.USER;
import static android.provider.Telephony.Carriers.USER_DELETED;
import static android.provider.Telephony.Carriers.USER_DELETED_BUT_PRESENT_IN_XML;
+import static android.provider.Telephony.Carriers.USER_EDITABLE;
import static android.provider.Telephony.Carriers.USER_EDITED;
import static android.provider.Telephony.Carriers.USER_VISIBLE;
import static android.provider.Telephony.Carriers.WAIT_TIME;
@@ -117,7 +118,7 @@
private static final boolean DBG = true;
private static final boolean VDBG = false; // STOPSHIP if true
- private static final int DATABASE_VERSION = 20 << 16;
+ private static final int DATABASE_VERSION = 21 << 16;
private static final int URL_UNKNOWN = 0;
private static final int URL_TELEPHONY = 1;
private static final int URL_CURRENT = 2;
@@ -210,6 +211,7 @@
CARRIERS_UNIQUE_FIELDS.add(PROFILE_ID);
CARRIERS_UNIQUE_FIELDS.add(PROTOCOL);
CARRIERS_UNIQUE_FIELDS.add(ROAMING_PROTOCOL);
+ CARRIERS_UNIQUE_FIELDS.add(USER_EDITABLE);
}
@VisibleForTesting
@@ -249,6 +251,7 @@
MTU + " INTEGER DEFAULT 0," +
EDITED + " INTEGER DEFAULT " + UNEDITED + "," +
USER_VISIBLE + " BOOLEAN DEFAULT 1," +
+ USER_EDITABLE + " BOOLEAN DEFAULT 1," +
// Uniqueness collisions are used to trigger merge code so if a field is listed
// here it means we will accept both (user edited + new apn_conf definition)
// Columns not included in UNIQUE constraint: name, current, edited,
@@ -869,11 +872,26 @@
} catch (SQLiteException e) {
if (DBG) {
log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
- " The table will get created in onOpen.");
+ "The table will get created in onOpen.");
}
}
oldVersion = 20 << 16 | 6;
}
+ if (oldVersion < (21 << 16 | 6)) {
+ try {
+ // Try to update the siminfo table. It might not be there.
+ db.execSQL("ALTER TABLE " + CARRIERS_TABLE + " ADD COLUMN " +
+ USER_EDITABLE + " INTEGER DEFAULT 1;");
+ } catch (SQLiteException e) {
+ // This is possible if the column already exists which may be the case if the
+ // table was just created as part of upgrade to version 19
+ if (DBG) {
+ log("onUpgrade skipping " + CARRIERS_TABLE + " upgrade. " +
+ "The table will get created in onOpen.");
+ }
+ }
+ oldVersion = 21 << 16 | 6;
+ }
if (DBG) {
log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
}
@@ -1287,6 +1305,7 @@
addBoolAttribute(parser, "carrier_enabled", map, CARRIER_ENABLED);
addBoolAttribute(parser, "modem_cognitive", map, MODEM_COGNITIVE);
addBoolAttribute(parser, "user_visible", map, USER_VISIBLE);
+ addBoolAttribute(parser, "user_editable", map, USER_EDITABLE);
int bearerBitmask = 0;
String bearerList = parser.getAttributeValue(null, "bearer_bitmask");