Merge "[Setting] Use @SystemApi to replace the hidden api" am: e74208c831 am: 7ec7514f1e

Change-Id: I9779621d46ba83975bcd552b7b36939d934110bf
2019-12-24 11:15:42 +00:00
parent 857267b1e8 7ec7514f1e
commit 7f659062a5
1 changed files with 3 additions and 2 deletions
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -104,9 +104,10 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
            p2pFactoryReset(mContext);

            TelephonyManager telephonyManager = (TelephonyManager)
-                    mContext.getSystemService(Context.TELEPHONY_SERVICE);
+                    mContext.getSystemService(TelephonyManager.class)
+                            .createForSubscriptionId(mSubId);
            if (telephonyManager != null) {
-                telephonyManager.factoryReset(mSubId);
+                telephonyManager.resetSettings();
            }

            NetworkPolicyManager policyManager = (NetworkPolicyManager)