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

am: 6d62355313 Change-Id: If6f49df149ebaf960f40336556e5e9c199c23ef2
2017-08-01 14:08:10 +00:00
parent 72054d6db3 6d62355313
commit cf83f9dd12
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