From 1a6875361138391e09759af1b0641aa3114ad47d Mon Sep 17 00:00:00 2001
From: Keun young Park <keunyoung@google.com>
Date: Tue, 18 Aug 2020 17:25:19 -0700
Subject: [PATCH] Do not update nightmode from settings for car mode

- Storing is disabled, so restoration should be disabled as well.
- The old behavior is problematic in device like car as car should
  stay in night mode even if there is a user switching.

Bug: 155167849
Test: run user switching and confirm no night mode change in car
Change-Id: I03a4649ef0848d14b2af3da43178c0dfe3f26a32
---
 .../core/java/com/android/server/UiModeManagerService.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java
index 6dbb1e922f602..dbdcc8729eea8 100644
--- a/services/core/java/com/android/server/UiModeManagerService.java
+++ b/services/core/java/com/android/server/UiModeManagerService.java
@@ -489,6 +489,9 @@ final class UiModeManagerService extends SystemService {
      * @return True if the new value is different from the old value. False otherwise.
      */
     private boolean updateNightModeFromSettingsLocked(Context context, Resources res, int userId) {
+        if (mCarModeEnabled) {
+            return false;
+        }
         int oldNightMode = mNightMode;
         if (mSetupWizardComplete) {
             mNightMode = Secure.getIntForUser(context.getContentResolver(),