Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 46b9bb83bf

Change-Id: I8f1102dbba29ac7bcb9553d5929ef2fb8ce1eb7d
This commit is contained in:
Beverly
2019-07-11 13:39:39 -07:00
committed by android-build-merger
parent 189c662b0e 46b9bb83bf
commit c108cfdd08
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/UiModeManagerService.java
View File

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