diff options
| author | Geoffrey Pitsch <gpitsch@google.com> | 2017-08-01 14:08:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-01 14:08:10 +0000 |
| commit | cf83f9dd125125e199a3aee8110c718e46ff8854 (patch) | |
| tree | b47eaa77dfb27e5840e9c537dfe5ddb0564bef35 /src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java | |
| parent | 72054d6db3296eb974538d5fa46d331fa0f5b10c (diff) | |
| parent | 6d62355313d7ce92f1ee79b91c6c6643e466e14b (diff) | |
| download | packages_apps_Settings-cf83f9dd125125e199a3aee8110c718e46ff8854.tar.gz packages_apps_Settings-cf83f9dd125125e199a3aee8110c718e46ff8854.tar.bz2 packages_apps_Settings-cf83f9dd125125e199a3aee8110c718e46ff8854.zip | |
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
am: 6d62355313
Change-Id: If6f49df149ebaf960f40336556e5e9c199c23ef2
Diffstat (limited to 'src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java index 53898e876b..fffa24391b 100644 --- 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 |