Dont access PhoneFactory, as it could have been inited in another JVM.

bug:19858201
Change-Id: I1684c473407b530d23a8965df3ff9a5353803397

1 files changed, 5 insertions, 7 deletions

diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 28fd92d..a67d2e6 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -134,22 +134,20 @@ public class ResetNetworkConfirm extends Fragment {
             }
 
             if (SubscriptionManager.isUsableSubIdValue(mSubId)) {
-                int phoneId = SubscriptionManager.getPhoneId(mSubId);
-                Phone phone = PhoneFactory.getPhone(phoneId);
-
                 // Turn mobile data on
-                phone.setDataEnabled(true);
+                telephonyManager.setDataEnabled(mSubId, true);
 
                 // Set mobile network selection mode to automatic
-                phone.setNetworkSelectionModeAutomatic(null);
+                // TODO set network selection mode to automatic
+                // phone.setNetworkSelectionModeAutomatic(null);
 
                 // Set preferred mobile network type to manufacturer's recommended
                 // int networkType = ; // TODO get manufacturer's default
-                // phone.setPreferredNetworkType(networkType, null);
+                // telephonyManager.setPreferredNetworkType(networkType);
 
                 // Turn roaming to manufacturer's default
                 // boolean enabled = ; // TODO get manufacturer's default
-                // phone.setDataRoamingEnabled(enabled);
+                // SubscriptionManager.from(getContext()).setDataRoaming(enabled, mSubId);
 
                 String subscriberId = telephonyManager.getSubscriberId(mSubId);
                 NetworkTemplate template = NetworkTemplate.buildTemplateMobileAll(subscriberId);