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

am: 5e6449b4f8 Change-Id: I2120ba6c52db5e012e3b467163594187c79664f1
2017-08-01 14:26:16 +00:00
parent 94a559eb6b 5e6449b4f8
commit 2db7b43623
3 changed files with 7 additions and 3 deletions
--- 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