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

Merge "Fix build"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-10 19:06:50 +00:00
committed by Android (Google) Code Review
parent 250595ae11 b886c1613c
commit a9b1cca103
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
View File

@@ -184,8 +184,6 @@ public class RecentAppsPreferenceControllerTest {
final Configuration configuration = new Configuration(); final Configuration configuration = new Configuration();
configuration.locale = Locale.US; configuration.locale = Locale.US;
when(mMockContext.getResources().getConfiguration()).thenReturn(configuration); when(mMockContext.getResources().getConfiguration()).thenReturn(configuration);
when(mMockContext.getString(eq(R.string.battery_history_minutes_no_seconds), anyInt()))
.thenReturn(mContext.getString(R.string.battery_history_minutes_no_seconds, 45));
mController = new RecentAppsPreferenceController(mMockContext, mAppState, null); mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);