PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
bug:19858201
Change-Id: I1684c473407b530d23a8965df3ff9a5353803397
This commit is contained in:
Stuart Scott
2015-03-23 17:53:39 -07:00
parent becc984a47
commit 97771a3b79
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -134,22 +134,20 @@ public class ResetNetworkConfirm extends Fragment {
} }
if (SubscriptionManager.isUsableSubIdValue(mSubId)) { if (SubscriptionManager.isUsableSubIdValue(mSubId)) {
int phoneId = SubscriptionManager.getPhoneId(mSubId);
Phone phone = PhoneFactory.getPhone(phoneId);
// Turn mobile data on // Turn mobile data on
phone.setDataEnabled(true); telephonyManager.setDataEnabled(mSubId, true);
// Set mobile network selection mode to automatic // 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 // Set preferred mobile network type to manufacturer's recommended
// int networkType = ; // TODO get manufacturer's default // int networkType = ; // TODO get manufacturer's default
// phone.setPreferredNetworkType(networkType, null); // telephonyManager.setPreferredNetworkType(networkType);
// Turn roaming to manufacturer's default // Turn roaming to manufacturer's default
// boolean enabled = ; // TODO get manufacturer's default // boolean enabled = ; // TODO get manufacturer's default
// phone.setDataRoamingEnabled(enabled); // SubscriptionManager.from(getContext()).setDataRoaming(enabled, mSubId);
String subscriberId = telephonyManager.getSubscriberId(mSubId); String subscriberId = telephonyManager.getSubscriberId(mSubId);
NetworkTemplate template = NetworkTemplate.buildTemplateMobileAll(subscriberId); NetworkTemplate template = NetworkTemplate.buildTemplateMobileAll(subscriberId);