Snap for 6465574 from 547bea0331cd9d24e3931fefe4ea4fdfd6ddbbcf to rvc-release (fc2b37d4) · Commits · e / os / android_frameworks_native

libs/renderengine/gl/GLESRenderEngine.cpp

+13 −2

Original line number	Diff line number	Diff line
		@@ -208,9 +208,20 @@ std::unique_ptr<GLESRenderEngine> GLESRenderEngine::create(const RenderEngineCre
		LOG_ALWAYS_FATAL("failed to initialize EGL");
		}

		const auto eglVersion = eglQueryStringImplementationANDROID(display, EGL_VERSION);
		if (!eglVersion) {
		checkGlError(__FUNCTION__, __LINE__);
		LOG_ALWAYS_FATAL("eglQueryStringImplementationANDROID(EGL_VERSION) failed");
		}

		const auto eglExtensions = eglQueryStringImplementationANDROID(display, EGL_EXTENSIONS);
		if (!eglExtensions) {
		checkGlError(__FUNCTION__, __LINE__);
		LOG_ALWAYS_FATAL("eglQueryStringImplementationANDROID(EGL_EXTENSIONS) failed");
		}

		GLExtensions& extensions = GLExtensions::getInstance();
		extensions.initWithEGLStrings(eglQueryStringImplementationANDROID(display, EGL_VERSION),
		eglQueryStringImplementationANDROID(display, EGL_EXTENSIONS));
		extensions.initWithEGLStrings(eglVersion, eglExtensions);

		// The code assumes that ES2 or later is available if this extension is
		// supported.

services/surfaceflinger/Client.cpp

+0 −5

Original line number	Diff line number	Diff line
		@@ -93,11 +93,6 @@ status_t Client::createWithSurfaceParent(const String8& name, uint32_t w, uint32
		uint32_t* outTransformHint) {
		if (mFlinger->authenticateSurfaceTexture(parent) == false) {
		ALOGE("failed to authenticate surface texture");
		// The extra parent layer check below before returning is to help with debugging
		// b/134888387. Once the bug is fixed the check can be deleted.
		if ((static_cast<MonitoredProducer*>(parent.get()))->getLayer() == nullptr) {
		ALOGE("failed to find parent layer");
		}
		return BAD_VALUE;
		}

services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -97,8 +97,8 @@ std::pair<nsecs_t, nsecs_t> RefreshRateConfigs::getDisplayFrames(nsecs_t layerPe
		return {displayFramesQuot, displayFramesRem};
		}

		const RefreshRate& RefreshRateConfigs::getRefreshRateForContentV2(
		const std::vector<LayerRequirement>& layers, bool touchActive,
		const RefreshRate& RefreshRateConfigs::getBestRefreshRate(
		const std::vector<LayerRequirement>& layers, bool touchActive, bool idle,
		bool* touchConsidered) const {
		ATRACE_CALL();
		ALOGV("getRefreshRateForContent %zu layers", layers.size());
		@@ -106,14 +106,6 @@ const RefreshRate& RefreshRateConfigs::getRefreshRateForContentV2(
		*touchConsidered = false;
		std::lock_guard lock(mLock);

		// If there are not layers, there is not content detection, so return the current
		// refresh rate.
		if (layers.empty()) {
		*touchConsidered = touchActive;
		return touchActive ? getMaxRefreshRateByPolicyLocked()
		: getCurrentRefreshRateByPolicyLocked();
		}

		int noVoteLayers = 0;
		int minVoteLayers = 0;
		int maxVoteLayers = 0;
		@@ -143,6 +135,14 @@ const RefreshRate& RefreshRateConfigs::getRefreshRateForContentV2(
		return getMaxRefreshRateByPolicyLocked();
		}

		if (!touchActive && idle) {
		return getMinRefreshRateByPolicyLocked();
		}

		if (layers.empty()) {
		return getCurrentRefreshRateByPolicyLocked();
		}

		// Only if all layers want Min we should return Min
		if (noVoteLayers + minVoteLayers == layers.size()) {
		return getMinRefreshRateByPolicyLocked();

services/surfaceflinger/Scheduler/RefreshRateConfigs.h

+8 −6

Original line number	Diff line number	Diff line
		@@ -212,12 +212,14 @@ public:
		const RefreshRate& getRefreshRateForContent(const std::vector<LayerRequirement>& layers) const
		EXCLUDES(mLock);

		// Returns the refresh rate that fits best to the given layers. This function also gets a
		// boolean flag that indicates whether user touched the screen recently to be factored in when
		// choosing the refresh rate and returns whether the refresh rate was chosen as a result of
		// a touch event.
		const RefreshRate& getRefreshRateForContentV2(const std::vector<LayerRequirement>& layers,
		bool touchActive, bool* touchConsidered) const
		// Returns the refresh rate that fits best to the given layers.
		// layers - The layer requirements to consider.
		// touchActive - Whether the user touched the screen recently. Used to apply touch boost.
		// idle - True if the system hasn't seen any buffers posted to layers recently.
		// touchConsidered - An output param that tells the caller whether the refresh rate was chosen
		// based on touch boost.
		const RefreshRate& getBestRefreshRate(const std::vector<LayerRequirement>& layers,
		bool touchActive, bool idle, bool* touchConsidered) const
		EXCLUDES(mLock);

		// Returns all the refresh rates supported by the device. This won't change at runtime.

services/surfaceflinger/Scheduler/Scheduler.cpp

+13 −15

Original line number	Diff line number	Diff line
		@@ -469,7 +469,7 @@ void Scheduler::notifyTouchEvent() {
		// that is currently on top. b/142507166 will give us this capability.
		std::lock_guard<std::mutex> lock(mFeatureStateLock);
		if (mLayerHistory) {
		// Layer History will be cleared based on RefreshRateConfigs::getRefreshRateForContentV2
		// Layer History will be cleared based on RefreshRateConfigs::getBestRefreshRate

		mTouchTimer->reset();

		@@ -582,19 +582,20 @@ HwcConfigIndexType Scheduler::calculateRefreshRateConfigIndexType() {
		return mRefreshRateConfigs.getMaxRefreshRateByPolicy().getConfigId();
		}

		const bool touchActive = mTouchTimer && mFeatures.touch == TouchState::Active;
		const bool idle = mIdleTimer && mFeatures.idleTimer == TimerState::Expired;

		if (!mUseContentDetectionV2) {
		// As long as touch is active we want to be in performance mode.
		if (mTouchTimer && mFeatures.touch == TouchState::Active) {
		if (touchActive) {
		return mRefreshRateConfigs.getMaxRefreshRateByPolicy().getConfigId();
		}
		}

		// If timer has expired as it means there is no new content on the screen.
		if (mIdleTimer && mFeatures.idleTimer == TimerState::Expired) {
		if (idle) {
		return mRefreshRateConfigs.getMinRefreshRateByPolicy().getConfigId();
		}

		if (!mUseContentDetectionV2) {
		// If content detection is off we choose performance as we don't know the content fps.
		if (mFeatures.contentDetectionV1 == ContentDetectionState::Off) {
		// NOTE: V1 always calls this, but this is not a default behavior for V2.
		@@ -607,11 +608,8 @@ HwcConfigIndexType Scheduler::calculateRefreshRateConfigIndexType() {
		}

		bool touchConsidered;
		const auto& ret =
		mRefreshRateConfigs
		.getRefreshRateForContentV2(mFeatures.contentRequirements,
		mTouchTimer &&
		mFeatures.touch == TouchState::Active,
		const auto& ret = mRefreshRateConfigs
		.getBestRefreshRate(mFeatures.contentRequirements, touchActive, idle,
		&touchConsidered)
		.getConfigId();
		if (touchConsidered) {