Merge "IMS: Use the slot based ImsManager factory reset API."

am: 9e4ff6fca6

Change-Id: I42b0a06ed5707475d105646233ac49958de29d75

diff --cc src/com/android/settings/ResetNetworkConfirm.java
index 4bdd8e1,7131e94..c05d6ce
--- 1/src/com/android/settings/ResetNetworkConfirm.java
--- 2/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@@ -150,29 -105,10 +150,30 @@@ public class ResetNetworkConfirm extend
                  }
              }
  
-             ImsManager.factoryReset(context);
+             ImsManager.getInstance(context,
+                      SubscriptionManager.getPhoneId(mSubId)).factoryReset();
              restoreDefaultApn(context);
 +            esimFactoryReset(context, context.getPackageName());
 +            // There has been issues when Sms raw table somehow stores orphan
 +            // fragments. They lead to garbled message when new fragments come
 +            // in and combied with those stale ones. In case this happens again,
 +            // user can reset all network settings which will clean up this table.
 +            cleanUpSmsRawTable(context);
 +        }
 +    };
 +
 +    private void cleanUpSmsRawTable(Context context) {
 +        ContentResolver resolver = context.getContentResolver();
 +        Uri uri = Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, "raw/permanentDelete");
 +        resolver.delete(uri, null, null);
 +    }
  
 +    @VisibleForTesting
 +    void esimFactoryReset(Context context, String packageName) {
 +        if (mEraseEsim) {
 +            mEraseEsimTask = new EraseEsimAsyncTask(context, packageName);
 +            mEraseEsimTask.execute();
 +        } else {
              Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                      .show();
          }