SF: Avoid a few nullable sp<DisplayDevice> params (39dfc94b) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+17 −17

Original line number	Diff line number	Diff line
		@@ -3304,7 +3304,7 @@ void SurfaceFlinger::processDisplayChanged(const wp<IBinder>& displayToken,

		// TODO(b/175678251) Call a listener instead.
		if (currentState.physical->hwcDisplayId == getHwComposer().getPrimaryHwcDisplayId()) {
		updateInternalDisplayVsyncLocked(display);
		updateActiveDisplayVsyncLocked(*display);
		}
		}
		return;
		@@ -3332,15 +3332,15 @@ void SurfaceFlinger::processDisplayChanged(const wp<IBinder>& displayToken,
		display->setDisplaySize(currentState.width, currentState.height);

		if (display->getId() == mActiveDisplayId) {
		onActiveDisplaySizeChanged(display);
		onActiveDisplaySizeChanged(*display);
		}
		}
		}
		}

		void SurfaceFlinger::updateInternalDisplayVsyncLocked(const sp<DisplayDevice>& activeDisplay) {
		void SurfaceFlinger::updateActiveDisplayVsyncLocked(const DisplayDevice& activeDisplay) {
		mVsyncConfiguration->reset();
		const Fps refreshRate = activeDisplay->getActiveMode().fps;
		const Fps refreshRate = activeDisplay.getActiveMode().fps;
		updatePhaseConfiguration(refreshRate);
		mRefreshRateStats->setRefreshRate(refreshRate);
		}
		@@ -4985,7 +4985,7 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal:

		static bool sPrimaryDisplay = true;
		if (sPrimaryDisplay \|\| activeDisplayChanged) {
		onActiveDisplayChangedLocked(activeDisplay, display);
		onActiveDisplayChangedLocked(activeDisplay.get(), *display);
		sPrimaryDisplay = false;
		}

		@@ -7267,35 +7267,35 @@ void SurfaceFlinger::sample() {
		mRegionSamplingThread->onCompositionComplete(mScheduler->getScheduledFrameTime());
		}

		void SurfaceFlinger::onActiveDisplaySizeChanged(const sp<const DisplayDevice>& activeDisplay) {
		mScheduler->onActiveDisplayAreaChanged(activeDisplay->getWidth() * activeDisplay->getHeight());
		getRenderEngine().onActiveDisplaySizeChanged(activeDisplay->getSize());
		void SurfaceFlinger::onActiveDisplaySizeChanged(const DisplayDevice& activeDisplay) {
		mScheduler->onActiveDisplayAreaChanged(activeDisplay.getWidth() * activeDisplay.getHeight());
		getRenderEngine().onActiveDisplaySizeChanged(activeDisplay.getSize());
		}

		void SurfaceFlinger::onActiveDisplayChangedLocked(const sp<DisplayDevice>& inactiveDisplay,
		const sp<DisplayDevice>& activeDisplay) {
		void SurfaceFlinger::onActiveDisplayChangedLocked(const DisplayDevice* inactiveDisplayPtr,
		const DisplayDevice& activeDisplay) {
		ATRACE_CALL();

		if (inactiveDisplay) {
		inactiveDisplay->getCompositionDisplay()->setLayerCachingTexturePoolEnabled(false);
		if (inactiveDisplayPtr) {
		inactiveDisplayPtr->getCompositionDisplay()->setLayerCachingTexturePoolEnabled(false);
		}

		mActiveDisplayId = activeDisplay->getPhysicalId();
		activeDisplay->getCompositionDisplay()->setLayerCachingTexturePoolEnabled(true);
		mActiveDisplayId = activeDisplay.getPhysicalId();
		activeDisplay.getCompositionDisplay()->setLayerCachingTexturePoolEnabled(true);

		updateInternalDisplayVsyncLocked(activeDisplay);
		updateActiveDisplayVsyncLocked(activeDisplay);
		mScheduler->setModeChangePending(false);
		mScheduler->setLeaderDisplay(mActiveDisplayId);

		onActiveDisplaySizeChanged(activeDisplay);
		mActiveDisplayTransformHint = activeDisplay->getTransformHint();
		mActiveDisplayTransformHint = activeDisplay.getTransformHint();

		// The policy of the new active/leader display may have changed while it was inactive. In that
		// case, its preferred mode has not been propagated to HWC (via setDesiredActiveMode). In either
		// case, the Scheduler's cachedModeChangedParams must be initialized to the newly active mode,
		// and the kernel idle timer of the newly active display must be toggled.
		constexpr bool kForce = true;
		applyRefreshRateSelectorPolicy(mActiveDisplayId, activeDisplay->refreshRateSelector(), kForce);
		applyRefreshRateSelectorPolicy(mActiveDisplayId, activeDisplay.refreshRateSelector(), kForce);
		}

		status_t SurfaceFlinger::addWindowInfosListener(

services/surfaceflinger/SurfaceFlinger.h

+4 −6

Original line number	Diff line number	Diff line
		@@ -1008,13 +1008,11 @@ private:
		VirtualDisplayId acquireVirtualDisplay(ui::Size, ui::PixelFormat) REQUIRES(mStateLock);
		void releaseVirtualDisplay(VirtualDisplayId);

		// TODO(b/255635821): Replace pointers with references. `inactiveDisplay` is only ever `nullptr`
		// in tests, and `activeDisplay` must not be `nullptr` as a precondition.
		void onActiveDisplayChangedLocked(const sp<DisplayDevice>& inactiveDisplay,
		const sp<DisplayDevice>& activeDisplay)
		void onActiveDisplayChangedLocked(const DisplayDevice* inactiveDisplayPtr,
		const DisplayDevice& activeDisplay)
		REQUIRES(mStateLock, kMainThreadContext);

		void onActiveDisplaySizeChanged(const sp<const DisplayDevice>&);
		void onActiveDisplaySizeChanged(const DisplayDevice&);

		/*
		* Debugging & dumpsys
		@@ -1080,7 +1078,7 @@ private:
		std::chrono::nanoseconds presentLatency);
		int getMaxAcquiredBufferCountForRefreshRate(Fps refreshRate) const;

		void updateInternalDisplayVsyncLocked(const sp<DisplayDevice>& activeDisplay)
		void updateActiveDisplayVsyncLocked(const DisplayDevice& activeDisplay)
		REQUIRES(mStateLock, kMainThreadContext);

		bool isHdrLayer(const frontend::LayerSnapshot& snapshot) const;

services/surfaceflinger/tests/unittests/SurfaceFlinger_DisplayModeSwitching.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ TEST_F(DisplayModeSwitchingTest, changeRefreshRate_OnActiveDisplay_WithRefreshRe
		ASSERT_FALSE(mDisplay->getDesiredActiveMode().has_value());
		ASSERT_EQ(mDisplay->getActiveMode().modePtr->getId(), kModeId60);

		mFlinger.onActiveDisplayChanged(mDisplay);
		mFlinger.onActiveDisplayChanged(*mDisplay);

		mFlinger.setDesiredDisplayModeSpecs(mDisplay->getDisplayToken().promote(),
		mock::createDisplayModeSpecs(kModeId90.value(), false, 0,
		@@ -159,7 +159,7 @@ TEST_F(DisplayModeSwitchingTest, changeRefreshRate_OnActiveDisplay_WithoutRefres

		ASSERT_FALSE(mDisplay->getDesiredActiveMode().has_value());

		mFlinger.onActiveDisplayChanged(mDisplay);
		mFlinger.onActiveDisplayChanged(*mDisplay);

		mFlinger.setDesiredDisplayModeSpecs(mDisplay->getDisplayToken().promote(),
		mock::createDisplayModeSpecs(kModeId90.value(), true, 0,
		@@ -195,7 +195,7 @@ TEST_F(DisplayModeSwitchingTest, twoConsecutiveSetDesiredDisplayModeSpecs) {
		ASSERT_FALSE(mDisplay->getDesiredActiveMode().has_value());
		ASSERT_EQ(mDisplay->getActiveMode().modePtr->getId(), kModeId60);

		mFlinger.onActiveDisplayChanged(mDisplay);
		mFlinger.onActiveDisplayChanged(*mDisplay);

		mFlinger.setDesiredDisplayModeSpecs(mDisplay->getDisplayToken().promote(),
		mock::createDisplayModeSpecs(kModeId90.value(), false, 0,
		@@ -238,7 +238,7 @@ TEST_F(DisplayModeSwitchingTest, changeResolution_OnActiveDisplay_WithoutRefresh
		ASSERT_FALSE(mDisplay->getDesiredActiveMode().has_value());
		ASSERT_EQ(mDisplay->getActiveMode().modePtr->getId(), kModeId60);

		mFlinger.onActiveDisplayChanged(mDisplay);
		mFlinger.onActiveDisplayChanged(*mDisplay);

		mFlinger.setDesiredDisplayModeSpecs(mDisplay->getDisplayToken().promote(),
		mock::createDisplayModeSpecs(kModeId90_4K.value(), false, 0,
		@@ -315,7 +315,7 @@ TEST_F(DisplayModeSwitchingTest, multiDisplay) {
		EXPECT_EQ(innerDisplay->getActiveMode().modePtr->getId(), kModeId60);
		EXPECT_EQ(outerDisplay->getActiveMode().modePtr->getId(), kModeId120);

		mFlinger.onActiveDisplayChanged(innerDisplay);
		mFlinger.onActiveDisplayChanged(*innerDisplay);

		EXPECT_EQ(NO_ERROR,
		mFlinger.setDesiredDisplayModeSpecs(innerDisplay->getDisplayToken().promote(),
		@@ -359,7 +359,7 @@ TEST_F(DisplayModeSwitchingTest, multiDisplay) {
		EXPECT_FALSE(outerDisplay->getDesiredActiveMode());
		EXPECT_EQ(outerDisplay->getActiveMode().modePtr->getId(), kModeId120);

		mFlinger.onActiveDisplayChanged(outerDisplay);
		mFlinger.onActiveDisplayChanged(*outerDisplay);

		// No transition on the inner display.
		EXPECT_FALSE(innerDisplay->getDesiredActiveMode());

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -473,7 +473,7 @@ public:
		return mFlinger->setDesiredDisplayModeSpecs(displayToken, specs);
		}

		void onActiveDisplayChanged(const sp<DisplayDevice>& activeDisplay) {
		void onActiveDisplayChanged(const DisplayDevice& activeDisplay) {
		Mutex::Autolock lock(mFlinger->mStateLock);
		ftl::FakeGuard guard(kMainThreadContext);
		mFlinger->onActiveDisplayChangedLocked(nullptr, activeDisplay);