Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set exact night display last activated time" into qt-r1-dev am: 95ebd376f0

Browse Source 
am: c475010a13

Change-Id: Idd32a005d83a4f8280ab89ade02b2bd38565d851
This commit is contained in:
Christine Franks
2019-06-17 12:49:16 -07:00
committed by android-build-merger
parent 31fb67923a c475010a13
commit 92dee62198
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/display/color/ColorDisplayService.java
View File

@@ -935,7 +935,7 @@ public final class ColorDisplayService extends SystemService {
if (mNightDisplayTintController.isActivatedStateNotSet()
|| (mNightDisplayTintController.isActivated() != activate)) {
mNightDisplayTintController.setActivated(activate);
mNightDisplayTintController.setActivated(activate, activate ? start : end);
}
updateNextAlarm(mNightDisplayTintController.isActivated(), now);
@@ -1131,6 +1131,14 @@ public final class ColorDisplayService extends SystemService {
@Override
public void setActivated(Boolean activated) {
setActivated(activated, LocalDateTime.now());
}
/**
* Use directly when it is important that the last activation time be exact (for example, an
* automatic change). Otherwise use {@link #setActivated(Boolean)}.
*/
public void setActivated(Boolean activated, @NonNull LocalDateTime lastActivationTime) {
if (activated == null) {
super.setActivated(null);
return;
@@ -1142,7 +1150,7 @@ public final class ColorDisplayService extends SystemService {
// This is a true state change, so set this as the last activation time.
Secure.putStringForUser(getContext().getContentResolver(),
Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
LocalDateTime.now().toString(),
lastActivationTime.toString(),
mCurrentUser);
}