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

Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice"

Browse Source
This commit is contained in:
Betty Chang
2020-01-09 08:49:48 +00:00
committed by Android (Google) Code Review
parent 595b8f3bc7 a8d56184c3
commit 976dca2149
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/datausage/DataUsageUtils.java
View File

@@ -159,11 +159,12 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU
* SubscriptionManager#INVALID_SUBSCRIPTION_ID
*/
public static int getDefaultSubscriptionId(Context context) {
SubscriptionManager subManager = SubscriptionManager.from(context);
SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
if (subManager == null) {
return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
SubscriptionInfo subscriptionInfo = subManager.getDefaultDataSubscriptionInfo();
SubscriptionInfo subscriptionInfo =
subManager.getActiveSubscriptionInfo(subManager.getDefaultDataSubscriptionId());
if (subscriptionInfo == null) {
List<SubscriptionInfo> list = subManager.getAllSubscriptionInfoList();
if (list.size() == 0) {