Merge "Don't persist new night mode setting in car mode" into qt-r1-dev

This commit is contained in:
TreeHugger Robot
2019-07-11 20:01:50 +00:00
committed by Android (Google) Code Review

View File

@@ -413,15 +413,15 @@ final class UiModeManagerService extends SystemService {
try {
synchronized (mLock) {
if (mNightMode != mode) {
if (UserManager.get(getContext()).isPrimaryUser()) {
SystemProperties.set(SYSTEM_PROPERTY_DEVICE_THEME,
Integer.toString(mode));
}
// Only persist setting if not in car mode
if (!mCarModeEnabled) {
Secure.putIntForUser(getContext().getContentResolver(),
Secure.UI_NIGHT_MODE, mode, user);
if (UserManager.get(getContext()).isPrimaryUser()) {
SystemProperties.set(SYSTEM_PROPERTY_DEVICE_THEME,
Integer.toString(mode));
}
}
mNightMode = mode;