From 304e35e30dcd84d3bbeb7d5b586220bebe485fa4 Mon Sep 17 00:00:00 2001
From: Fiona Campbell <flc@google.com>
Date: Thu, 29 Apr 2021 16:47:35 +0100
Subject: [PATCH] Save display persistent data store

Fixes the fact that brightnesses weren't saved over reboots since it was previously save very infrequently.
Save persistent data store when device locks or sleeps.

Bug: 185440868

Test: manual
Change-Id: I5ddf142787f2f71d19ab37777dcea9eac1084d21
---
 .../java/com/android/server/display/DisplayManagerService.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index 0a4b137fa6cdd..f75f3e1f2f79e 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -1282,6 +1282,7 @@ public final class DisplayManagerService extends SystemService {
         // this point.
         sendDisplayEventLocked(displayId, DisplayManagerGlobal.EVENT_DISPLAY_CHANGED);
         scheduleTraversalLocked(false);
+        mPersistentDataStore.saveIfNeeded();
     }
 
     private void handleLogicalDisplayFrameRateOverridesChangedLocked(
@@ -2884,6 +2885,7 @@ public final class DisplayManagerService extends SystemService {
                     if (dpc != null) {
                         dpc.putScreenBrightnessSetting(brightness);
                     }
+                    mPersistentDataStore.saveIfNeeded();
                 }
             } finally {
                 Binder.restoreCallingIdentity(token);