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

Merge "Do not use warning or limit to display "X B left" above usage bar" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-05 21:36:59 +00:00
committed by Android (Google) Code Review
parent 2c8a78a97c bdd559a181
commit 3f59ce67b6
2 changed files with 13 additions and 9 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

@@ -76,8 +76,6 @@ public class DataUsageSummaryPreferenceControllerTest {
@Mock
private DataUsageController mDataUsageController;
@Mock
private DataUsageInfoController mDataInfoController;
@Mock
private DataUsageSummaryPreference mSummaryPreference;
@Mock
private NetworkPolicyEditor mPolicyEditor;
@@ -96,6 +94,8 @@ public class DataUsageSummaryPreferenceControllerTest {
@Mock
private ConnectivityManager mConnectivityManager;
private DataUsageInfoController mDataInfoController;
private FakeFeatureFactory mFactory;
private Activity mActivity;
private Context mContext;
@@ -113,6 +113,7 @@ public class DataUsageSummaryPreferenceControllerTest {
when(mFactory.metricsFeatureProvider.getMetricsCategory(any(Object.class)))
.thenReturn(MetricsProto.MetricsEvent.SETTINGS_APP_NOTIF_CATEGORY);
ShadowEntityHeaderController.setUseMock(mHeaderController);
mDataInfoController = new DataUsageInfoController();
mActivity = spy(Robolectric.buildActivity(Activity.class).get());
when(mActivity.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);