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

[Settings] Mobile data usage code refactor

Browse Source 
Code refactor

Bug: 151751844
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Change-Id: If85207ebe2edb8c547bb6dac0c55bbd146b62361
This commit is contained in:
Bonian Chen
2020-04-22 13:11:03 +08:00
parent 8f26e88bd9
commit 6ea4727eb4
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/network/telephony/DataUsagePreferenceController.java
View File

@@ -36,7 +36,6 @@ public class DataUsagePreferenceController extends TelephonyBasePreferenceContro
private NetworkTemplate mTemplate; private NetworkTemplate mTemplate;
private DataUsageController.DataUsageInfo mDataUsageInfo; private DataUsageController.DataUsageInfo mDataUsageInfo;
private Intent mIntent;
public DataUsagePreferenceController(Context context, String key) { public DataUsagePreferenceController(Context context, String key) {
super(context, key); super(context, key);
@@ -54,8 +53,11 @@ public class DataUsagePreferenceController extends TelephonyBasePreferenceContro
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) { if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
return false; return false;
} }
final Intent intent = new Intent(Settings.ACTION_MOBILE_DATA_USAGE);
intent.putExtra(Settings.EXTRA_NETWORK_TEMPLATE, mTemplate);
intent.putExtra(Settings.EXTRA_SUB_ID, mSubId);
mContext.startActivity(mIntent); mContext.startActivity(intent);
return true; return true;
} }
@@ -84,16 +86,13 @@ public class DataUsagePreferenceController extends TelephonyBasePreferenceContro
public void init(int subId) { public void init(int subId) {
mSubId = subId; mSubId = subId;
if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { if (!SubscriptionManager.isValidSubscriptionId(subId)) {
mTemplate = DataUsageUtils.getDefaultTemplate(mContext, mSubId); return;
final DataUsageController controller = new DataUsageController(mContext);
controller.setSubscriptionId(mSubId);
mDataUsageInfo = controller.getDataUsageInfo(mTemplate);
mIntent = new Intent(Settings.ACTION_MOBILE_DATA_USAGE);
mIntent.putExtra(Settings.EXTRA_NETWORK_TEMPLATE, mTemplate);
mIntent.putExtra(Settings.EXTRA_SUB_ID, mSubId);
} }
mTemplate = DataUsageUtils.getDefaultTemplate(mContext, mSubId);
final DataUsageController controller = new DataUsageController(mContext);
controller.setSubscriptionId(mSubId);
mDataUsageInfo = controller.getDataUsageInfo(mTemplate);
} }
} }