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

Merge "Only show mobile data usage information when mobile data is enabled." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-21 18:29:21 +00:00
committed by Android (Google) Code Review
parent 940630bae1 19375adb5a
commit d17e849775
3 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -104,18 +104,10 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable
removePreference(KEY_RESTRICT_BACKGROUND);
}
if (hasMobileData) {
List<SubscriptionInfo> subscriptions =
services.mSubscriptionManager.getActiveSubscriptionInfoList();
if (subscriptions == null || subscriptions.size() == 0) {
addMobileSection(defaultSubId);
}
for (int i = 0; subscriptions != null && i < subscriptions.size(); i++) {
SubscriptionInfo subInfo = subscriptions.get(i);
if (subscriptions.size() > 1) {
addMobileSection(subInfo.getSubscriptionId(), subInfo);
} else {
addMobileSection(subInfo.getSubscriptionId());
}
SubscriptionInfo subInfo
= services.mSubscriptionManager.getDefaultDataSubscriptionInfo();
if (subInfo != null) {
addMobileSection(subInfo.getSubscriptionId());
}
}
boolean hasWifiRadio = DataUsageUtils.hasWifiRadio(context);

4
src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
View File

@@ -37,7 +37,6 @@ import android.util.RecurrenceRule;
import com.android.internal.util.CollectionUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.FeatureFlags;
import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.net.DataUsageController;
@@ -150,7 +149,8 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
return mSubscriptionManager.getDefaultDataSubscriptionInfo() != null
? AVAILABLE : DISABLED_UNSUPPORTED;
}
@Override