Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77

Original change: undetermined

Change-Id: I1e3964c6c35dad4c6092c8959b048e01a139e95d
This commit is contained in:
Bonian Chen
2020-06-02 14:46:56 +00:00
committed by Automerger Merge Worker
7 changed files with 204 additions and 8 deletions

View File

@@ -29,6 +29,7 @@ import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.datausage.lib.DataUsageLib;
import com.android.settingslib.net.DataUsageController;
import com.android.settingslib.utils.ThreadUtils;
@@ -99,7 +100,7 @@ public class DataUsagePreferenceController extends TelephonyBasePreferenceContro
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
return null;
}
return DataUsageUtils.getMobileTemplate(context, subId);
return DataUsageLib.getMobileTemplate(context, subId);
}
private NetworkTemplate getNetworkTemplate() {