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

Merge "Clean up unused NetworkPolicyEditor" into main

Browse Source
This commit is contained in:
Chaohui Wang
2023-08-18 11:43:00 +00:00
committed by Android (Google) Code Review
parent aba17fc847 abe2710dc0
commit 2ba1805e27
6 changed files with 0 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
View File

@@ -47,7 +47,6 @@ import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.net.DataUsageController;
@@ -87,8 +86,6 @@ public class DataUsageSummaryPreferenceControllerTest {
@Mock
private DataUsageSummaryPreference mSummaryPreference;
@Mock
private NetworkPolicyEditor mPolicyEditor;
@Mock
private NetworkTemplate mNetworkTemplate;
@Mock
private SubscriptionInfo mSubscriptionInfo;
@@ -145,7 +142,6 @@ public class DataUsageSummaryPreferenceControllerTest {
mDataUsageController,
mDataInfoController,
mNetworkTemplate,
mPolicyEditor,
mActivity, null, null, null, mDefaultSubscriptionId));
doReturn(null).when(mController).getSubscriptionInfo(
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
@@ -372,7 +368,6 @@ public class DataUsageSummaryPreferenceControllerTest {
mDataUsageController,
mDataInfoController,
mNetworkTemplate,
mPolicyEditor,
mActivity, mLifecycle, mHeaderController, mPreferenceFragment,
mDefaultSubscriptionId));

5
tests/robotests/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceControllerTest.java
View File

@@ -24,7 +24,6 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.net.NetworkPolicyManager;
import android.telephony.TelephonyManager;
import androidx.fragment.app.FragmentActivity;
@@ -60,8 +59,6 @@ public class WifiDataUsageSummaryPreferenceControllerTest {
@Mock
TelephonyManager mTelephonyManager;
@Mock
NetworkPolicyManager mNetworkPolicyManager;
@Mock
DataUsageSummaryPreference mSummaryPreference;
@Mock
DataUsageController mDataUsageController;
@@ -75,8 +72,6 @@ public class WifiDataUsageSummaryPreferenceControllerTest {
public void setUp() {
doReturn(mContext.getResources()).when(mActivity).getResources();
doReturn(mTelephonyManager).when(mActivity).getSystemService(TelephonyManager.class);
doReturn(mNetworkPolicyManager).when(mActivity)
.getSystemService(NetworkPolicyManager.class);
doNothing().when(mSummaryPreference).setWifiMode(anyBoolean(), anyString(), anyBoolean());
doReturn(mDataUsageInfo).when(mDataUsageController).getDataUsageInfo(any());