Revert "Postpone color mode change until after boot animation" am: 2924d01304 am: 53bb4e138c (76f33e7d) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/SurfaceFlinger.cpp

+9 −20

Original line number	Diff line number	Diff line
		@@ -417,20 +417,10 @@ void SurfaceFlinger::bootFinished()
		LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,
		ns2ms(systemTime(SYSTEM_TIME_MONOTONIC)));

		sp<LambdaMessage> bootFinished = new LambdaMessage([&]() {
		mBootFinished = true;

		sp<LambdaMessage> readProperties = new LambdaMessage([&]() {
		readPersistentProperties();

		#ifdef USE_HWC2
		sp<DisplayDevice> hw(getDisplayDevice(mBuiltinDisplays[DisplayDevice::DISPLAY_PRIMARY]));
		if (hw->getWideColorSupport()) {
		hw->setCompositionDataSpace(HAL_DATASPACE_V0_SRGB);
		setActiveColorModeInternal(hw, HAL_COLOR_MODE_SRGB);
		}
		#endif
		});
		postMessageAsync(bootFinished);
		postMessageAsync(readProperties);
		}

		void SurfaceFlinger::deleteTextureAsync(uint32_t texture) {
		@@ -595,7 +585,7 @@ void SurfaceFlinger::init() {
		ALOGI( "SurfaceFlinger's main thread ready to run. "
		"Initializing graphics H/W...");

		ALOGI("Phase offset NS: %" PRId64 "", vsyncPhaseOffsetNs);
		ALOGI("Phase offest NS: %" PRId64 "", vsyncPhaseOffsetNs);

		Mutex::Autolock _l(mStateLock);

		@@ -1284,7 +1274,11 @@ void SurfaceFlinger::createDefaultDisplayDevice() {
		token, fbs, producer, mRenderEngine->getEGLConfig(),
		hasWideColorModes && hasWideColorDisplay);
		mDisplays.add(token, hw);
		setActiveColorModeInternal(hw, HAL_COLOR_MODE_NATIVE);
		android_color_mode defaultColorMode = HAL_COLOR_MODE_NATIVE;
		if (hasWideColorModes && hasWideColorDisplay) {
		defaultColorMode = HAL_COLOR_MODE_SRGB;
		}
		setActiveColorModeInternal(hw, defaultColorMode);
		hw->setCompositionDataSpace(HAL_DATASPACE_UNKNOWN);

		// Add the primary display token to mDrawingState so we don't try to
		@@ -1928,12 +1922,7 @@ void SurfaceFlinger::setUpHWComposer() {
		}
		newColorMode = pickColorMode(newDataSpace);

		// We want the color mode of the boot animation to match that of the bootloader
		// To achieve this we suppress color mode changes until after the boot animation
		if (mBootFinished) {
		setActiveColorModeInternal(displayDevice, newColorMode);
		displayDevice->setCompositionDataSpace(newDataSpace);
		}
		}
		}