Merge "Update display color mode before white balance" into qt-r1-dev am: f2c8370d3c (adfb0531) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/color/ColorDisplayService.java

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -465,12 +465,16 @@ public final class ColorDisplayService extends SystemService {
	.setMatrix(mNightDisplayTintController.getColorTemperatureSetting());		.setMatrix(mNightDisplayTintController.getColorTemperatureSetting());
	}		}

			// dtm.setColorMode() needs to be called before
			// updateDisplayWhiteBalanceStatus(), this is because the latter calls
			// DisplayTransformManager.needsLinearColorMatrix(), therefore it is dependent
			// on the state of DisplayTransformManager.
			final DisplayTransformManager dtm = getLocalService(DisplayTransformManager.class);
			dtm.setColorMode(mode, mNightDisplayTintController.getMatrix());

	if (mDisplayWhiteBalanceTintController.isAvailable(getContext())) {		if (mDisplayWhiteBalanceTintController.isAvailable(getContext())) {
	updateDisplayWhiteBalanceStatus();		updateDisplayWhiteBalanceStatus();
	}		}

	final DisplayTransformManager dtm = getLocalService(DisplayTransformManager.class);
	dtm.setColorMode(mode, mNightDisplayTintController.getMatrix());
	}		}

	private void onAccessibilityActivated() {		private void onAccessibilityActivated() {