summaryrefslogtreecommitdiff
path: root/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
diff options
context:
space:
mode:
authorJay Aliomer <aaliomer@google.com>2020-05-13 15:39:46 +0000
committerJay Aliomer <aaliomer@google.com>2020-05-14 15:14:18 +0000
commitdba11e82b59c50b3fa2d679ffacf3eb327a28daa (patch)
tree3b2f09a3f7264712b123e5d36832c187c66c3d1a /src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
parentfa1e102af7e4285215224c2acc523c3cd97e7c0a (diff)
Revert "Revert "Unable to select twilight scheduling after enabling location""
This reverts commit 782438347bdc0ecdf0f0e27ece27cadd5525ada1. Bug: 153115261 Reason for revert: fixing tests Change-Id: I497a2b83cbe3eaee5f5fb3eb4df73618130fc6e2
Diffstat (limited to 'src/com/android/settings/display/NightDisplayAutoModePreferenceController.java')
-rw-r--r--src/com/android/settings/display/NightDisplayAutoModePreferenceController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
index fb2dbc3b90..ef11e00ceb 100644
--- a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
@@ -74,7 +74,7 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont
if (String.valueOf(ColorDisplayManager.AUTO_MODE_TWILIGHT).equals(newValue)
&& !mLocationManager.isLocationEnabled()) {
TwilightLocationDialog.show(mContext);
- return false;
+ return true;
}
return mColorDisplayManager.setNightDisplayAutoMode(Integer.parseInt((String) newValue));
}