diff options
3 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java index 53898e876b..fffa24391b 100644 --- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java @@ -77,7 +77,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends @Override public boolean isAvailable() { - return mConfig.alwaysOnAvailable(); + return mConfig.alwaysOnAvailableForUser(MY_USER); } @Override diff --git a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java index 59ca483036..3dcf6ab6d0 100644 --- a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java +++ b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java @@ -62,6 +62,10 @@ public class AmbientDisplayConfiguration { return true; } + public boolean alwaysOnAvailableForUser(int user) { + return true; + } + public boolean available() { return true; } diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java index 3f3f4b5218..386980709d 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java @@ -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(); |