Merge "Correcting mNightMode which should set from Configuration" into sc-v2-dev am: 08361ad4e7 am: 2c4b245e81

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16226486

Change-Id: I11038630a72cb21170eb81e92105c4d78ccf540b
This commit is contained in:
Wei Sheng Shih
2021-11-11 05:23:11 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
@@ -308,7 +306,7 @@ public class PackageConfigPersister {
}
boolean isResetNightMode() {
return mNightMode == MODE_NIGHT_AUTO || mNightMode == MODE_NIGHT_CUSTOM;
return mNightMode == Configuration.UI_MODE_NIGHT_UNDEFINED;
}
@Override