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

am: 07052239fd Change-Id: Id42693f5c0ba902f57c5c30a69ca19dba1d9e340
2017-08-01 14:16:59 +00:00
parent c96e9fc57d 07052239fd
commit 5e6449b4f8
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