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

Get rid of unnecessary KEY_RESTRICT_BACKGROUND preference.

Browse Source 
This preference is not needed for Data plan settings page. This change
fixes the NPE which happens because we try to remove a preference which
is not added to the settings preference fragment.
Test: make RunSettingsRoboTests -j40
Bug: 64068792

Change-Id: Ibbcf1637b8aed1a94542ea3786170f2f318df4a9
This commit is contained in:
Rajeev Kumar
2017-09-25 11:34:10 -07:00
parent eafcc98ab8
commit 298ffee39e
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,6 @@ import java.util.List;
public class DataPlanUsageSummary extends DataUsageBase implements Indexable { public class DataPlanUsageSummary extends DataUsageBase implements Indexable {
public static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
public static final String KEY_DATA_PLAN_USAGE = "data_plan_usage"; public static final String KEY_DATA_PLAN_USAGE = "data_plan_usage";
public static final String KEY_STATUS_HEADER = "status_header"; public static final String KEY_STATUS_HEADER = "status_header";
@@ -100,10 +99,6 @@ public class DataPlanUsageSummary extends DataUsageBase implements Indexable {
} }
mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, defaultSubId); mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, defaultSubId);
if (!hasMobileData || !isAdmin()) {
removePreference(KEY_RESTRICT_BACKGROUND);
}
if (hasMobileData) { if (hasMobileData) {
addDataPlanSection(defaultSubId); addDataPlanSection(defaultSubId);
} }