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 am: 3f59ce67b6

Browse Source 
am: eff9d43739

Change-Id: I8af506c4d7be28f8b5a966f2d4f38aeb13994b85
This commit is contained in:
Jan Nordqvist
2018-04-05 15:18:18 -07:00
committed by android-build-merger
parent 537dcf8cb1 eff9d43739
commit 0c36260db1
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

@@ -77,8 +77,6 @@ public class DataUsageSummaryPreferenceControllerTest {
@Mock
private DataUsageController mDataUsageController;
@Mock
private DataUsageInfoController mDataInfoController;
@Mock
private DataUsageSummaryPreference mSummaryPreference;
@Mock
private NetworkPolicyEditor mPolicyEditor;
@@ -97,6 +95,8 @@ public class DataUsageSummaryPreferenceControllerTest {
@Mock
private ConnectivityManager mConnectivityManager;
private DataUsageInfoController mDataInfoController;
private FakeFeatureFactory mFactory;
private Activity mActivity;
private Context mContext;
@@ -114,6 +114,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);