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

Merge "Clean up unused Lifecycle" into main

Browse Source
This commit is contained in:
Chaohui Wang
2023-08-22 10:36:32 +00:00
committed by Android (Google) Code Review
parent 47c6c86015 cdbe5f350d
commit adc24bca63
7 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ public class DataUsageSummaryPreferenceControllerTest {
mDataUsageController,
mDataInfoController,
mNetworkTemplate,
mActivity, null, null, null, mDefaultSubscriptionId));
mActivity, null, null, mDefaultSubscriptionId));
doReturn(null).when(mController).getSubscriptionInfo(
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
doReturn(null).when(mController).getSubscriptionPlans(

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

@@ -29,7 +29,6 @@ import android.telephony.TelephonyManager;
import androidx.fragment.app.FragmentActivity;
import androidx.test.core.app.ApplicationProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.net.DataUsageController;
import org.junit.Before;
@@ -55,8 +54,6 @@ public class WifiDataUsageSummaryPreferenceControllerTest {
@Mock
FragmentActivity mActivity;
@Mock
Lifecycle mLifecycle;
@Mock
TelephonyManager mTelephonyManager;
@Mock
DataUsageSummaryPreference mSummaryPreference;
@@ -75,7 +72,7 @@ public class WifiDataUsageSummaryPreferenceControllerTest {
doNothing().when(mSummaryPreference).setWifiMode(anyBoolean(), anyString(), anyBoolean());
doReturn(mDataUsageInfo).when(mDataUsageController).getDataUsageInfo(any());
mController = spy(new WifiDataUsageSummaryPreferenceController(mActivity, mLifecycle, null,
mController = spy(new WifiDataUsageSummaryPreferenceController(mActivity, null,
mAllNetworkKeys));
doReturn(mDataUsageController).when(mController).createDataUsageController(any());
}