Merge "Reset last activated time after auto mode changed" into oc-dr1-dev

2017-06-20 23:45:07 +00:00
parent 8d4ff1b34f 4bcc06f39c
commit 13cfb46e41
1 changed files with 4 additions and 0 deletions
--- a/core/java/com/android/internal/app/NightDisplayController.java
+++ b/core/java/com/android/internal/app/NightDisplayController.java
@@ -182,6 +182,10 @@ public final class NightDisplayController {
            throw new IllegalArgumentException("Invalid autoMode: " + autoMode);
        }

+        if (getAutoMode() != autoMode) {
+            Secure.putLongForUser(mContext.getContentResolver(),
+                    Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME, -1L, mUserId);
+        }
        return Secure.putIntForUser(mContext.getContentResolver(),
                Secure.NIGHT_DISPLAY_AUTO_MODE, autoMode, mUserId);
    }