diff options
author | Wink Saville <wink@google.com> | 2014-11-19 10:34:28 -0800 |
---|---|---|
committer | Wink Saville <wink@google.com> | 2014-11-19 10:34:28 -0800 |
commit | 1285f74fcb6a8bf080c224e5a36db00ab1167d4c (patch) | |
tree | a41e6efd6fd06fa94d780a8c3cc0e9ea57a0d7b9 /src/com/android/settings/DataUsageSummary.java | |
parent | 3a84d40133e7a4f74fd1df091ba43fb85859b169 (diff) | |
download | packages_apps_Settings-1285f74fcb6a8bf080c224e5a36db00ab1167d4c.zip packages_apps_Settings-1285f74fcb6a8bf080c224e5a36db00ab1167d4c.tar.gz packages_apps_Settings-1285f74fcb6a8bf080c224e5a36db00ab1167d4c.tar.bz2 |
Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
Diffstat (limited to 'src/com/android/settings/DataUsageSummary.java')
-rw-r--r-- | src/com/android/settings/DataUsageSummary.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index a625b47..cb9c54b 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -195,6 +195,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable private INetworkStatsService mStatsService; private NetworkPolicyManager mPolicyManager; private TelephonyManager mTelephonyManager; + private SubscriptionManager mSubscriptionManager; private INetworkStatsSession mStatsSession; @@ -286,13 +287,14 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable ServiceManager.getService(Context.NETWORK_STATS_SERVICE)); mPolicyManager = NetworkPolicyManager.from(context); mTelephonyManager = TelephonyManager.from(context); + mSubscriptionManager = SubscriptionManager.from(context); mPrefs = getActivity().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE); mPolicyEditor = new NetworkPolicyEditor(mPolicyManager); mPolicyEditor.read(); - mSubInfoList = SimSettings.getSortedSubInfoList(getActivity()); + mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList(); mMobileTagMap = initMobileTabTag(mSubInfoList); try { @@ -942,7 +944,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable } else { //SUB SELECT isEnable = mTelephonyManager.getDataEnabled() - && (subId == SubscriptionManager.getDefaultDataSubId()); + && (subId == mSubscriptionManager.getDefaultDataSubId()); } return isEnable; } @@ -1131,8 +1133,8 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable private void handleMultiSimDataDialog() { final SubscriptionInfo currentSir = getCurrentTabSubInfo(getActivity()); - final SubscriptionInfo nextSir = SubscriptionManager.getSubscriptionInfoForSubscriber( - SubscriptionManager.getDefaultDataSubId()); + final SubscriptionInfo nextSir = mSubscriptionManager.getActiveSubscriptionInfo( + mSubscriptionManager.getDefaultDataSubId()); if (currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) { setMobileDataEnabled(true); @@ -1149,7 +1151,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { - SubscriptionManager.setDefaultDataSubId(currentSir.getSubscriptionId()); + mSubscriptionManager.setDefaultDataSubId(currentSir.getSubscriptionId()); setMobileDataEnabled(true); updateBody(); } @@ -2246,7 +2248,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable final NetworkTemplate template = intent.getParcelableExtra(EXTRA_NETWORK_TEMPLATE); if (template == null) { final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY, - SubscriptionManager.INVALID_SUB_ID); + SubscriptionManager.INVALID_SUBSCRIPTION_ID); if (SubscriptionManager.isValidSubId(subId)) { return TAB_MOBILE + String.valueOf(subId); } @@ -2339,7 +2341,8 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable final ConnectivityManager conn = ConnectivityManager.from(context); final TelephonyManager tele = TelephonyManager.from(context); - final List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList(); + final List<SubscriptionInfo> subInfoList = + SubscriptionManager.from(context).getActiveSubscriptionInfoList(); // No activated Subscription if (subInfoList == null) { return false; |