Merge "Add mCar check to some mCarModeEnabled checks" (4cef6d74) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -489,7 +489,7 @@ final class UiModeManagerService extends SystemService {
		* @return True if the new value is different from the old value. False otherwise.
		*/
		private boolean updateNightModeFromSettingsLocked(Context context, Resources res, int userId) {
		if (mCarModeEnabled) {
		if (mCarModeEnabled \|\| mCar) {
		return false;
		}
		int oldNightMode = mNightMode;
		@@ -1036,7 +1036,7 @@ final class UiModeManagerService extends SystemService {

		private void persistNightMode(int user) {
		// Only persist setting if not in car mode
		if (mCarModeEnabled) return;
		if (mCarModeEnabled \|\| mCar) return;
		Secure.putIntForUser(getContext().getContentResolver(),
		Secure.UI_NIGHT_MODE, mNightMode, user);
		Secure.putLongForUser(getContext().getContentResolver(),
		@@ -1049,7 +1049,7 @@ final class UiModeManagerService extends SystemService {

		private void persistNightModeOverrides(int user) {
		// Only persist setting if not in car mode
		if (mCarModeEnabled) return;
		if (mCarModeEnabled \|\| mCar) return;
		Secure.putIntForUser(getContext().getContentResolver(),
		Secure.UI_NIGHT_MODE_OVERRIDE_ON, mOverrideNightModeOn ? 1 : 0, user);
		Secure.putIntForUser(getContext().getContentResolver(),
		@@ -1100,7 +1100,7 @@ final class UiModeManagerService extends SystemService {
		}

		// Override night mode in power save mode if not in car mode
		if (mPowerSave && !mCarModeEnabled) {
		if (mPowerSave && !mCarModeEnabled && !mCar) {
		uiMode &= ~Configuration.UI_MODE_NIGHT_NO;
		uiMode \|= Configuration.UI_MODE_NIGHT_YES;
		} else {