From 58cb003ab2d2acb9e09785e2077385021ac3c763 Mon Sep 17 00:00:00 2001 From: Jay Aliomer Date: Mon, 26 Oct 2020 15:50:40 -0400 Subject: [PATCH] Dark theme resets when new user is created Fixes: 169106225 Test: manual create secondary users Change-Id: I55f3e5cdcd9260f20c4f291be821ef076cb7daf7 --- .../core/java/com/android/server/UiModeManagerService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index 0135b9d2f8ab1..7051452f25cc7 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -501,7 +501,7 @@ final class UiModeManagerService extends SystemService { } /** - * Updates the night mode setting in Settings.Global and returns if the value was successfully + * Updates the night mode setting in Settings.Secure and returns if the value was successfully * changed. * * @param context A valid context @@ -516,7 +516,8 @@ final class UiModeManagerService extends SystemService { int oldNightMode = mNightMode; if (mSetupWizardComplete) { mNightMode = Secure.getIntForUser(context.getContentResolver(), - Secure.UI_NIGHT_MODE, mNightMode, userId); + Secure.UI_NIGHT_MODE, res.getInteger( + com.android.internal.R.integer.config_defaultNightMode), userId); mOverrideNightModeOn = Secure.getIntForUser(context.getContentResolver(), Secure.UI_NIGHT_MODE_OVERRIDE_ON, 0, userId) != 0; mOverrideNightModeOff = Secure.getIntForUser(context.getContentResolver(),