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

[Settings] Move mobile data template out of framework

Browse Source 
Move mobile data template out of framework

Bug: 151751844
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageLibTest
Change-Id: I5072cd1e673194d00b3ce82242bf5fbad88d23cd
This commit is contained in:
Bonian Chen
2020-05-29 17:28:34 +08:00
parent 90331c0f20
commit d40f7f707e
7 changed files with 204 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ import android.text.format.Formatter;
import android.text.format.Formatter.BytesResult;
import android.util.Log;
import com.android.settings.datausage.lib.DataUsageLib;
import com.android.settings.network.ProxySubscriptionManager;
import java.util.List;
@@ -183,7 +184,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU
*/
public static NetworkTemplate getDefaultTemplate(Context context, int defaultSubId) {
if (SubscriptionManager.isValidSubscriptionId(defaultSubId) && hasMobileData(context)) {
return getMobileTemplate(context, defaultSubId);
return DataUsageLib.getMobileTemplate(context, defaultSubId);
} else if (hasWifiRadio(context)) {
return NetworkTemplate.buildTemplateWifiWildcard();
} else {