Merge "Do not update nightmode from settings for car mode"

2020-08-27 22:01:55 +00:00
parent 01a96b4745 1a68753611
commit a6ae5034cf
1 changed files with 3 additions and 0 deletions
--- 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(),