Merge "AOD setting availability depends on other user settings" into oc-dr1-dev

am: 6d62355313 Change-Id: Iad2c8b60c899314b5089d28b3697f7bfed9013b3
2017-08-01 14:07:37 +00:00
parent 26e7518f76 6d62355313
commit 07052239fd
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
@@ -75,7 +75,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro

    @Override
    public boolean isAvailable() {
-        return mConfig.alwaysOnAvailable();
+        return mConfig.alwaysOnAvailableForUser(MY_USER);
    }

    @Override