commit aca1e304bddaf813bc0398c04017dc0c5739e69a
author Brad Ebinger <breadley@google.com> Mon Jul 16 13:55:25 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 16 13:55:25 2018 -0700
tree 22a5f4eee9716930606e4c3829d63366df11bfaa
parent ca9617ac6bd08b0aeb12119f1a4b95c64db1fbbf
parent 15ca33865c0af134977bd0cbb350ecdb7ad26232

Merge "IMS: Use the slot based ImsManager factory reset API." am: 9e4ff6fca6
am: 15ca33865c

Change-Id: I5fcdcb5b74a828d4377d2bc4e8e567f61ff9a899

src/com/android/settings/ResetNetworkConfirm.java

diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 4bdd8e1..c05d6ce 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -150,7 +150,8 @@
                 }
             }
 
-            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