Snap for 5503058 from 88b197a747393d1aa6b8b8302e30e8bd94d69d92 to qt-release (0f8d17a1) · Commits · e / os / android_frameworks_native

libs/dumputils/dump_utils.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -54,8 +54,10 @@ static const char* hal_interfaces_to_dump[] {
		"android.hardware.media.c2@1.0::IComponentStore",
		"android.hardware.media.omx@1.0::IOmx",
		"android.hardware.media.omx@1.0::IOmxStore",
		"android.hardware.power@1.3::IPower",
		"android.hardware.power.stats@1.0::IPowerStats",
		"android.hardware.sensors@1.0::ISensors",
		"android.hardware.thermal@2.0::IThermal",
		"android.hardware.vr@1.0::IVr",
		NULL,
		};

+3 −1

Original line number	Diff line number	Diff line
		@@ -575,7 +575,9 @@ String8 ProgramCache::generateFragmentShader(const Key& needs) {
		float applyCornerRadius(vec2 cropCoords)
		{
		vec2 position = cropCoords - cropCenter;
		vec2 dist = abs(position) + vec2(cornerRadius) - cropCenter;
		// Increase precision here so that a large corner radius doesn't
		// cause floating point error
		highp vec2 dist = abs(position) + vec2(cornerRadius) - cropCenter;
		float plane = length(max(dist, vec2(0.0)));
		return 1.0 - clamp(plane - cornerRadius, 0.0, 1.0);
		}

+2 −6

Original line number	Diff line number	Diff line
		@@ -980,7 +980,7 @@ bool SurfaceFlinger::performSetActiveConfig() {
		if (mPreviousPresentFence != Fence::NO_FENCE &&
		(mPreviousPresentFence->getStatus() == Fence::Status::Unsignaled)) {
		// fence has not signaled yet. wait for the next invalidate
		repaintEverythingForHWC();
		mEventQueue->invalidateForHWC();
		return true;
		}

		@@ -1031,7 +1031,7 @@ bool SurfaceFlinger::performSetActiveConfig() {

		// we need to submit an empty frame to HWC to start the process
		mCheckPendingFence = true;

		mEventQueue->invalidateForHWC();
		return false;
		}

		@@ -1447,10 +1447,6 @@ void SurfaceFlinger::setRefreshRateTo(RefreshRateType refreshRate, Scheduler::Co
		return;
		}

		if (desiredConfigId == display->getActiveConfig()) {
		return;
		}

		setDesiredActiveConfig({refreshRate, desiredConfigId, event});
		}