| commit | f3fc635947d969f0b2e52c4f6f6983af4220d176 | [log] [tgz] |
|---|---|---|
| author | Geoffrey Pitsch <gpitsch@google.com> | Fri Jul 28 15:09:51 2017 -0400 |
| committer | Geoffrey Pitsch <gpitsch@google.com> | Mon Jul 31 13:56:41 2017 -0400 |
| tree | 1e8ebfad8e41a5711462650addd0272cd2a87291 | |
| parent | b79d38f2f3407b19fdd7980e66918d26eff53c8b [diff] |
AOD setting availability depends on other user settings Bug: 62918778 Test: make ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest RunSettingsRoboTests -j Change-Id: Id6f1ad580cf5caace82a1bfa85e85b98f134f9d6
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java index 03bcc72..160786f 100644 --- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -75,7 +75,7 @@ @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 59ca483..3dcf6ab 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 @@ 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 3f3f4b5..3869807 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 @@ @Test public void isAvailable_available() throws Exception { - when(mConfig.alwaysOnAvailable()) + when(mConfig.alwaysOnAvailableForUser(anyInt())) .thenReturn(true); assertThat(mController.isAvailable()).isTrue(); @@ -113,7 +113,7 @@ @Test public void isAvailable_unavailable() throws Exception { - when(mConfig.alwaysOnAvailable()) + when(mConfig.alwaysOnAvailableForUser(anyInt())) .thenReturn(false); assertThat(mController.isAvailable()).isFalse();