commit b659e1be774ea2509add117df59719bd337922f7
author Xiangyu/Malcolm Chen <refuhoo@google.com> Tue Nov 27 00:24:00 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 27 00:24:00 2018 +0000
tree 5ac872dd202610bd379403664462e9a78e1c6c9b
parent fc10d0a4e42aaec807ea8284d5006b3c245ecc97
parent c7eb4eacc3080aa4348ff4a3cdbf7831649337f0

Merge changes from topic "Group ID"

* changes:
  Remove the "alter table drop column" to prevent upgrade failure.
  Update TelephonyProvider to add group ID.

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 812785e..93308fe 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -2265,7 +2265,7 @@
         return s_apnSourceServiceExists;
     }
 
-    private void restoreApnsWithService() {
+    private void restoreApnsWithService(int subId) {
         Context context = getContext();
         Resources r = context.getResources();
         ServiceConnection connection = new ServiceConnection() {
@@ -2304,7 +2304,7 @@
                         }
                     }
                     try {
-                        ContentValues[] values = mIApnSourceService.getApns();
+                        ContentValues[] values = mIApnSourceService.getApns(subId);
                         if (values != null) {
                             // we use the unsynchronized insert because this function is called
                             // within the syncrhonized function delete()
@@ -3573,7 +3573,7 @@
         editorApn.apply();
 
         if (apnSourceServiceExists(getContext())) {
-            restoreApnsWithService();
+            restoreApnsWithService(subId);
         } else {
             initDatabaseWithDatabaseHelper(db);
         }