commit 77e0f799d264cd1ef0645a766446da3706026111
author Nazanin Bakhshi <nazaninb@google.com> Mon Nov 26 13:32:48 2018 -0800
committer Nazanin Bakhshi <nazaninb@google.com> Tue Nov 27 21:12:18 2018 -0800
tree e5042f7e8b02a0c31eaf496bfc30a19adda992c7
parent d96849b747c145355ba3fe897258ceffce527324

add setMetered in SubscriptionManager

Test: no tests
Bug: 119316354
Change-Id: I85224b4b5fdfee9391f673bb3950ad510b978133

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 93308fe..251c486 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -143,7 +143,7 @@
     private static final boolean DBG = true;
     private static final boolean VDBG = false; // STOPSHIP if true
 
-    private static final int DATABASE_VERSION = 30 << 16;
+    private static final int DATABASE_VERSION = 31 << 16;
     private static final int URL_UNKNOWN = 0;
     private static final int URL_TELEPHONY = 1;
     private static final int URL_CURRENT = 2;
@@ -381,7 +381,8 @@
                 + SubscriptionManager.WFC_IMS_ROAMING_ENABLED + " INTEGER DEFAULT -1,"
                 + SubscriptionManager.IS_OPPORTUNISTIC + " INTEGER DEFAULT 0,"
                 + SubscriptionManager.PARENT_SUB_ID + " INTEGER DEFAULT -1,"
-                + SubscriptionManager.GROUP_UUID + " TEXT"
+                + SubscriptionManager.GROUP_UUID + " TEXT,"
+                + SubscriptionManager.IS_METERED + " INTEGER DEFAULT 1"
                 + ");";
     }
 
@@ -1150,15 +1151,30 @@
                 try {
                     // Try to update the siminfo table. It might not be there.
                     db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
-                            + SubscriptionManager.GROUP_UUID + " TEXT;");
+                        + SubscriptionManager.GROUP_UUID + " TEXT;");
+                } catch (SQLiteException e) {
+                    if (DBG) {
+                        log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
+                            "The table will get created in onOpen.");
+                    }
+                }
+                oldVersion = 30 << 16 | 6;
+            }
+            
+            if (oldVersion < (31 << 16 | 6)) {
+                try {
+                    // Try to update the siminfo table. It might not be there.
+                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
+                            + SubscriptionManager.IS_METERED + " INTEGER DEFAULT 1;");
                 } catch (SQLiteException e) {
                     if (DBG) {
                         log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
                                 "The table will get created in onOpen.");
                     }
                 }
-                oldVersion = 30 << 16 | 6;
+                oldVersion = 31 << 16 | 6;
             }
+
             if (DBG) {
                 log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
             }