am 30fb79e5: am f070a957: Merge "The sub_id column in the carriers should be an INTEGER instead of a LONG" into lmp-mr1-dev
* commit '30fb79e59e5ea0acd7c4f511adba79e7190e7ad0':
The sub_id column in the carriers should be an INTEGER instead of a LONG
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 54c27aa..5c7948f 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -229,7 +229,7 @@
"bearer INTEGER," +
"mvno_type TEXT," +
"mvno_match_data TEXT," +
- "sub_id LONG DEFAULT " + SubscriptionManager.INVALID_SUB_ID + "," +
+ "sub_id INTEGER DEFAULT " + SubscriptionManager.INVALID_SUB_ID + "," +
"profile_id INTEGER default 0," +
"modem_cognitive BOOLEAN default 0," +
"max_conns INTEGER default 0," +
@@ -337,7 +337,7 @@
}
if (oldVersion < (9 << 16 | 6)) {
db.execSQL("ALTER TABLE " + CARRIERS_TABLE +
- " ADD COLUMN sub_id LONG DEFAULT " +
+ " ADD COLUMN sub_id INTEGER DEFAULT " +
SubscriptionManager.INVALID_SUB_ID + ";");
oldVersion = 9 << 16 | 6;
}