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

Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313 am: 07052239fd

Browse Source 
am: 5e6449b4f8

Change-Id: I2120ba6c52db5e012e3b467163594187c79664f1
This commit is contained in:
Geoffrey Pitsch
2017-08-01 14:26:16 +00:00
committed by android-build-merger
parent 94a559eb6b 5e6449b4f8
commit 2db7b43623
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
View File

@@ -62,6 +62,10 @@ public class AmbientDisplayConfiguration {
return true;
}
public boolean alwaysOnAvailableForUser(int user) {
return true;
}
public boolean available() {
return true;
}

4
tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
View File

@@ -105,7 +105,7 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest {
@Test
public void isAvailable_available() throws Exception {
when(mConfig.alwaysOnAvailable())
when(mConfig.alwaysOnAvailableForUser(anyInt()))
.thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
@@ -113,7 +113,7 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest {
@Test
public void isAvailable_unavailable() throws Exception {
when(mConfig.alwaysOnAvailable())
when(mConfig.alwaysOnAvailableForUser(anyInt()))
.thenReturn(false);
assertThat(mController.isAvailable()).isFalse();