commit ce42c6449ceff2ba2737ceced05ac8f0966361d7
author Chaitanya Saggurthi <csaggurt@codeaurora.org> Mon Mar 21 22:35:34 2016 +0530
committer Nishanth Kumar Sirivolu <nishanthsirivolu@codeaurora.org> Sat Sep 03 01:03:09 2016 +0530
tree babd564135e4df068dd4ef93045070a7ad51210c
parent c763d5cdaa1f7803b2216bc58b3a1a5a6619a852

Fix apn restore issue for multi-sim.

If "Restore to Default" option is selected on apn menu, then
all carriers table entries are deleted and apns file is read
again. Due to this, user added apns on both subs are lost though
restore is selected for one sub.
Fix is to delete all apns except for user added apns on the
other available sub.

Change-Id: I4c01e87829c7deca2cf29b479149d79d7e78c9c7
CRs-Fixed: 985437

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 90a0b8a..cec7e81 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -2234,9 +2234,38 @@
 
     private void restoreDefaultAPN(int subId) {
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+        TelephonyManager mTm =
+               (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
+        SubscriptionManager sm = SubscriptionManager.from(getContext());
+        String selSubOperatorNumeric = mTm.getSimOperator(subId);
+        String otherSubOperatorNumeric = null;
+        String where = null;
+        List<SubscriptionInfo> subInfoList = sm.getActiveSubscriptionInfoList();
+        int simCountWithSameNumeric = 0;
+        if (subInfoList != null && subInfoList.size() > 1) {
+            where = "not (";
+            for (SubscriptionInfo subInfo : subInfoList) {
+               if (subId != subInfo.getSubscriptionId()) {
+                  otherSubOperatorNumeric = mTm.getSimOperator(
+                          subInfo.getSubscriptionId());
+                  if (!otherSubOperatorNumeric.equalsIgnoreCase(selSubOperatorNumeric)) {
+                      where = where + "numeric=" + otherSubOperatorNumeric + " and ";
+                  } else {
+                      simCountWithSameNumeric++;
+                  }
+               }
+            }
+            where = where + "edited=" + USER_EDITED + ")";
+        }
+
+        if (simCountWithSameNumeric == subInfoList.size() - 1) {
+            //Reset where as all slots have same sims
+            where = null;
+        }
+        log("restoreDefaultAPN: where: " + where);
 
         try {
-            db.delete(CARRIERS_TABLE, null, null);
+            db.delete(CARRIERS_TABLE, where, null);
         } catch (SQLException e) {
             loge("got exception when deleting to restore: " + e);
         }