From 1740d85440c261fe60f178d52f1531c4cd108cb4 Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Wed, 10 Nov 2021 20:26:01 +0800 Subject: [PATCH] Correcting mNightMode which should set from Configuration Bug: 205658898 Test: atest SplashscreenTests ActivityTaskManagerServiceTests WindowProcessControllerTests Change-Id: Ie238bfd99ffeae4db9de04c19cdaa1785a920cfc --- .../java/com/android/server/wm/PackageConfigPersister.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/PackageConfigPersister.java b/services/core/java/com/android/server/wm/PackageConfigPersister.java index 081a53e7bd055..fe21e5f0011e4 100644 --- a/services/core/java/com/android/server/wm/PackageConfigPersister.java +++ b/services/core/java/com/android/server/wm/PackageConfigPersister.java @@ -16,10 +16,8 @@ package com.android.server.wm; -import static android.app.UiModeManager.MODE_NIGHT_AUTO; -import static android.app.UiModeManager.MODE_NIGHT_CUSTOM; - import android.annotation.NonNull; +import android.content.res.Configuration; import android.os.Environment; import android.os.LocaleList; import android.util.AtomicFile; @@ -303,7 +301,7 @@ public class PackageConfigPersister { } boolean isResetNightMode() { - return mNightMode == MODE_NIGHT_AUTO || mNightMode == MODE_NIGHT_CUSTOM; + return mNightMode == Configuration.UI_MODE_NIGHT_UNDEFINED; } @Override