Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use BillingCycleRepository in DataUsageList

Browse Source 
Unify the enable logic for the "Data warning & limit" page.

Bug: 290856342
Test: manual - on DataUsageList
Test: m RunSettingsRoboTests
Change-Id: I3014461ef21768b5d0eb6d91873a4ba52d20f6bf
This commit is contained in:
Chaohui Wang
2023-09-20 00:20:50 +08:00
parent c39acee194
commit 8c5bd75560
8 changed files with 58 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/com/android/settings/datausage/DataUsageBaseFragment.java
View File

@@ -15,23 +15,13 @@
package com.android.settings.datausage;
import android.content.Context;
import android.net.NetworkPolicy;
import android.net.NetworkPolicyManager;
import android.os.Bundle;
import android.os.INetworkManagementService;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.NetworkPolicyEditor;
public abstract class DataUsageBaseFragment extends DashboardFragment {
private static final String TAG = "DataUsageBase";
private static final String ETHERNET = "ethernet";
protected final TemplatePreference.NetworkServices services =
new TemplatePreference.NetworkServices();
@@ -41,16 +31,10 @@ public abstract class DataUsageBaseFragment extends DashboardFragment {
super.onCreate(icicle);
Context context = getContext();
services.mNetworkService = INetworkManagementService.Stub.asInterface(
ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
services.mPolicyManager = (NetworkPolicyManager) context
.getSystemService(Context.NETWORK_POLICY_SERVICE);
services.mPolicyEditor = new NetworkPolicyEditor(services.mPolicyManager);
services.mTelephonyManager = context.getSystemService(TelephonyManager.class);
services.mSubscriptionManager = SubscriptionManager.from(context);
services.mUserManager = UserManager.get(context);
}
@Override
@@ -58,33 +42,4 @@ public abstract class DataUsageBaseFragment extends DashboardFragment {
super.onResume();
services.mPolicyEditor.read();
}
protected boolean isAdmin() {
return services.mUserManager.isAdminUser();
}
protected boolean isMobileDataAvailable(int subId) {
return services.mSubscriptionManager.getActiveSubscriptionInfo(subId) != null;
}
protected boolean isNetworkPolicyModifiable(NetworkPolicy policy, int subId) {
return policy != null && isBandwidthControlEnabled() && services.mUserManager.isAdminUser()
&& isDataEnabled(subId);
}
private boolean isDataEnabled(int subId) {
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
return true;
}
return services.mTelephonyManager.getDataEnabled(subId);
}
protected boolean isBandwidthControlEnabled() {
try {
return services.mNetworkService.isBandwidthControlEnabled();
} catch (RemoteException e) {
Log.w(TAG, "problem talking with INetworkManagementService: ", e);
return false;
}
}
}