commit 2decd2d982c50228520b17b472fad9b8f694bed4
author Amit Mahajan <amitmahajan@google.com> Fri Sep 13 14:05:19 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 13 14:05:19 2019 -0700
tree 38ba9fbc9d4e0bc1f4f4bfdb5dfa3f9b30413fe7
parent 4c695e2d117242fad97adceae3b3c00294975f67
parent 2a2122144750c97c16b913ff6ff100ffc7ceff8e

Merge "Fix logic to preserve preferred APN across build update." am: 9244cf1ea8 am: 48835bad79
am: 2a21221447

Change-Id: I2e62fb29d255b51625cde2b8a774e8f0bcaf5640

assets/carrier_list.pb

diff --git a/assets/carrier_list.pb b/assets/carrier_list.pb
index 93bc1b3..0c5e5b9 100644
--- a/assets/carrier_list.pb
+++ b/assets/carrier_list.pb
Binary files differ

assets/carrier_list.textpb

diff --git a/assets/carrier_list.textpb b/assets/carrier_list.textpb
index 1e033ee..ab01907 100644
--- a/assets/carrier_list.textpb
+++ b/assets/carrier_list.textpb
Binary files differ

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index d931cc4..56e9c8b 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -147,7 +147,7 @@
     private static final boolean DBG = true;
     private static final boolean VDBG = false; // STOPSHIP if true
 
-    private static final int DATABASE_VERSION = 41 << 16;
+    private static final int DATABASE_VERSION = 42 << 16;
     private static final int URL_UNKNOWN = 0;
     private static final int URL_TELEPHONY = 1;
     private static final int URL_CURRENT = 2;
@@ -375,6 +375,7 @@
                 + SubscriptionManager.IS_EMBEDDED + " INTEGER DEFAULT 0,"
                 + SubscriptionManager.CARD_ID + " TEXT NOT NULL,"
                 + SubscriptionManager.ACCESS_RULES + " BLOB,"
+                + SubscriptionManager.ACCESS_RULES_FROM_CARRIER_CONFIGS + " BLOB,"
                 + SubscriptionManager.IS_REMOVABLE + " INTEGER DEFAULT 0,"
                 + SubscriptionManager.CB_EXTREME_THREAT_ALERT + " INTEGER DEFAULT 1,"
                 + SubscriptionManager.CB_SEVERE_THREAT_ALERT + " INTEGER DEFAULT 1,"
@@ -1364,6 +1365,19 @@
                 oldVersion = 41 << 16 | 6;
             }
 
+            if (oldVersion < (42 << 16 | 6)) {
+                try {
+                    // Try to update the siminfo table. It might not be there.
+                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN " +
+                        SubscriptionManager.ACCESS_RULES_FROM_CARRIER_CONFIGS + " BLOB;");
+                } catch (SQLiteException e) {
+                    if (DBG) {
+                        log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
+                                "The table will get created in onOpen.");
+                    }
+                }
+            }
+
 
             if (DBG) {
                 log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);