Merge "Return correct config from getActiveConfig()" (287827d2) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+10 −1

Original line number	Diff line number	Diff line
		@@ -876,8 +876,17 @@ int SurfaceFlinger::getActiveConfig(const sp<IBinder>& displayToken) {
		return BAD_VALUE;
		}

		if (display->isPrimary()) {
		std::lock_guard<std::mutex> lock(mActiveConfigLock);
		if (mDesiredActiveConfigChanged) {
		return mDesiredActiveConfig.configId;
		} else {
		return display->getActiveConfig();
		}
		} else {
		return display->getActiveConfig();
		}
		}

		void SurfaceFlinger::setDesiredActiveConfig(const ActiveConfigInfo& info) {
		ATRACE_CALL();