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

Merge "Switch settings to use TimeDetector" am: d32eee26e3

Browse Source 
am: 5ef64ad89b

Change-Id: I8901a6595677380013cc3d063426a4dfead18b97
This commit is contained in:
Neil Fuller
2019-11-28 00:59:44 -08:00
committed by android-build-merger
parent b61f54519b 5ef64ad89b
commit 3296857f38
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
View File

@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.AlarmManager;
import android.app.timedetector.TimeDetector;
import android.content.Context;
import com.android.settingslib.RestrictedPreference;
@@ -40,7 +40,7 @@ public class DatePreferenceControllerTest {
@Mock
private Context mContext;
@Mock
private AlarmManager mAlarmManager;
private TimeDetector mTimeDetector;
@Mock
private DatePreferenceController.DatePreferenceHost mHost;
@Mock
@@ -52,7 +52,7 @@ public class DatePreferenceControllerTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mAlarmManager);
when(mContext.getSystemService(TimeDetector.class)).thenReturn(mTimeDetector);
mPreference = new RestrictedPreference(RuntimeEnvironment.application);
mController = new DatePreferenceController(mContext, mHost, mAutoTimePreferenceController);
}