Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev

am: b48e6e46b3

Change-Id: I8aedf3695394a296cb1b1ea7111232c6d25aa07a
This commit is contained in:
Matthew Fritze
2017-04-27 19:55:29 +00:00
committed by android-build-merger
8 changed files with 55 additions and 21 deletions

View File

@@ -75,6 +75,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
private static final String KEY_LIMIT_SUMMARY = "limit_summary";
private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
private static final String KEY_NETWORK_RESTRICTIONS = "network_restrictions";
private static final String KEY_WIFI_USAGE_TITLE = "wifi_category";
private DataUsageController mDataUsageController;
private DataUsageInfoController mDataInfoController;
@@ -491,6 +492,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
if (hasMobileData) {
keys.add(KEY_RESTRICT_BACKGROUND);
}
keys.add(KEY_WIFI_USAGE_TITLE);
return keys;
}