commit da6072193663eb8a8256be47b32c949640a0da2b
author Amit Mahajan <amitmahajan@google.com> Thu Oct 08 09:13:00 2015 -0700
committer Amit Mahajan <amitmahajan@google.com> Tue Oct 13 13:18:06 2015 -0700
tree 9e729c315ba6b50c243fe4bda722ab7b693df575
parent c34237fda9ca200973bf4962115eaaa1e34e9930

Change to add user_visible field to Carriers table.

Bug: 24519879
Bug: 24681288
Change-Id: Ia7ad66bc287aa736fdd1762bb1946022e50eaab6

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 67b0645..13faf27 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -66,7 +66,7 @@
     private static final boolean DBG = true;
     private static final boolean VDBG = false; // STOPSHIP if true
 
-    private static final int DATABASE_VERSION = 16 << 16;
+    private static final int DATABASE_VERSION = 17 << 16;
     private static final int URL_UNKNOWN = 0;
     private static final int URL_TELEPHONY = 1;
     private static final int URL_CURRENT = 2;
@@ -265,6 +265,7 @@
                     "max_conns_time INTEGER DEFAULT 0," +
                     "mtu INTEGER DEFAULT 0," +
                     "edited INTEGER DEFAULT " + Telephony.Carriers.UNEDITED + "," +
+                    "user_visible 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,
@@ -587,6 +588,11 @@
                 }
                 oldVersion = 16 << 16 | 6;
             }
+            if (oldVersion < (17 << 16 | 6)) {
+                db.execSQL("ALTER TABLE " + CARRIERS_TABLE + " ADD COLUMN " +
+                        Telephony.Carriers.USER_VISIBLE + " BOOLEAN DEFAULT 1;");
+                oldVersion = 17 << 16 | 6;
+            }
             if (DBG) {
                 log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
             }
@@ -932,8 +938,10 @@
             addIntAttribute(parser, "max_conns_time", map, Telephony.Carriers.MAX_CONNS_TIME);
             addIntAttribute(parser, "mtu", map, Telephony.Carriers.MTU);
 
+
             addBoolAttribute(parser, "carrier_enabled", map, Telephony.Carriers.CARRIER_ENABLED);
             addBoolAttribute(parser, "modem_cognitive", map, Telephony.Carriers.MODEM_COGNITIVE);
+            addBoolAttribute(parser, "user_visible", map, Telephony.Carriers.USER_VISIBLE);
 
             String bearerList = parser.getAttributeValue(null, "bearer_bitmask");
             if (bearerList != null) {