Merge "Don't persist new night mode setting in car mode" into qt-r1-dev am: 46b9bb83bf (50164915) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/UiModeManagerService.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -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;