commit 9f8adb6e7d6e7938b9313046437ba30b1ddfb6b5
author android-build-team Robot <android-build-team-robot@google.com> Sat Jun 01 23:12:12 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jun 01 23:12:12 2019 +0000
tree dc82f91bb08fa325376848651892eb38273e310b
parent d905b2bf5764f19a6a0d3e7543761a96af177c85
parent e9e9cb3d51af76a1c6e0fa70aa7f5516508e3955

Snap for 5626731 from e9e9cb3d51af76a1c6e0fa70aa7f5516508e3955 to qt-release

Change-Id: I13f1f07e92fd3b611d4c279d0538382579131ca2

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 129be00..3eebc6a 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -148,7 +148,7 @@
     private static final boolean DBG = true;
     private static final boolean VDBG = false; // STOPSHIP if true
 
-    private static final int DATABASE_VERSION = 39 << 16;
+    private static final int DATABASE_VERSION = 40 << 16;
     private static final int URL_UNKNOWN = 0;
     private static final int URL_TELEPHONY = 1;
     private static final int URL_CURRENT = 2;
@@ -401,7 +401,8 @@
                 + SubscriptionManager.SUBSCRIPTION_TYPE + " INTEGER DEFAULT "
                 + SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM + ","
                 + SubscriptionManager.WHITE_LISTED_APN_DATA + " INTEGER DEFAULT 0,"
-                + SubscriptionManager.GROUP_OWNER + " TEXT"
+                + SubscriptionManager.GROUP_OWNER + " TEXT,"
+                + SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES + " TEXT"
                 + ");";
     }
 
@@ -1320,6 +1321,20 @@
                 oldVersion = 39 << 16 | 6;
             }
 
+            if (oldVersion < (40 << 16 | 6)) {
+                try {
+                    // Try to update the siminfo table. It might not be there.
+                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
+                            + SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES + " TEXT;");
+                } catch (SQLiteException e) {
+                    if (DBG) {
+                        log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
+                                "The table will get created in onOpen.");
+                    }
+                }
+                oldVersion = 40 << 16 | 6;
+            }
+
             if (DBG) {
                 log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
             }

tests/src/com/android/providers/telephony/CarrierIdProviderTest.java

diff --git a/tests/src/com/android/providers/telephony/CarrierIdProviderTest.java b/tests/src/com/android/providers/telephony/CarrierIdProviderTest.java
index e5dd6e6..bc39260 100644
--- a/tests/src/com/android/providers/telephony/CarrierIdProviderTest.java
+++ b/tests/src/com/android/providers/telephony/CarrierIdProviderTest.java
@@ -148,6 +148,9 @@
         mContext = new MockContextWithProvider(mCarrierIdProviderTestable);
         mContentResolver = mContext.getContentResolver();
         mContentObserver = new FakeContentObserver(null);
+
+        doReturn("").when(mSubController).getDataEnabledOverrideRules(anyInt());
+
         Field field = SubscriptionController.class.getDeclaredField("sInstance");
         field.setAccessible(true);
         field.set(null, mSubController);