Skip to content

Commit ec207e8

Browse files
author
Dennis Kiilerich
committed
Rename setPowerModeInternal to setPhysicalDisplayPowerMode
Bug: 342681202 Flag: EXEMPT refactor Test: built Change-Id: Ib562fdc672f09e92c646583840c324ad50e2fa39
1 parent d0503fa commit ec207e8

7 files changed

Lines changed: 77 additions & 76 deletions

‎services/surfaceflinger/SurfaceFlinger.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4164,7 +4164,7 @@ void SurfaceFlinger::processDisplayChanged(const wp<IBinder>& displayToken,
41644164
if (currentState.physical) {
41654165
const auto display = getDisplayDeviceLocked(displayToken);
41664166
if (!mSkipPowerOnForQuiescent) {
4167-
setPowerModeInternal(display, hal::PowerMode::ON);
4167+
setPhysicalDisplayPowerMode(display, hal::PowerMode::ON);
41684168
}
41694169

41704170
if (display->getPhysicalId() == mActiveDisplayId) {
@@ -5655,7 +5655,7 @@ void SurfaceFlinger::initializeDisplays() {
56555655

56565656
// In case of a restart, ensure all displays are off.
56575657
for (const auto& [id, display] : mPhysicalDisplays) {
5658-
setPowerModeInternal(getDisplayDeviceLocked(id), hal::PowerMode::OFF);
5658+
setPhysicalDisplayPowerMode(getDisplayDeviceLocked(id), hal::PowerMode::OFF);
56595659
}
56605660

56615661
// Power on all displays. The primary display is first, so becomes the active display. Also,
@@ -5664,13 +5664,14 @@ void SurfaceFlinger::initializeDisplays() {
56645664
// Additionally, do not turn on displays if the boot should be quiescent.
56655665
if (!mSkipPowerOnForQuiescent) {
56665666
for (const auto& [id, display] : mPhysicalDisplays) {
5667-
setPowerModeInternal(getDisplayDeviceLocked(id), hal::PowerMode::ON);
5667+
setPhysicalDisplayPowerMode(getDisplayDeviceLocked(id), hal::PowerMode::ON);
56685668
}
56695669
}
56705670
}
56715671
}
56725672

5673-
void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal::PowerMode mode) {
5673+
void SurfaceFlinger::setPhysicalDisplayPowerMode(const sp<DisplayDevice>& display,
5674+
hal::PowerMode mode) {
56745675
if (display->isVirtual()) {
56755676
// TODO(b/241285876): This code path should not be reachable, so enforce this at compile
56765677
// time.
@@ -5846,7 +5847,7 @@ void SurfaceFlinger::setPowerMode(const sp<IBinder>& displayToken, int mode) {
58465847
}
58475848
} else {
58485849
ftl::FakeGuard guard(mStateLock);
5849-
setPowerModeInternal(display, static_cast<hal::PowerMode>(mode));
5850+
setPhysicalDisplayPowerMode(display, static_cast<hal::PowerMode>(mode));
58505851
}
58515852
});
58525853

‎services/surfaceflinger/SurfaceFlinger.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ class SurfaceFlinger : public BnSurfaceComposer,
733733
void applyActiveMode(PhysicalDisplayId) REQUIRES(kMainThreadContext);
734734

735735
// Called on the main thread in response to setPowerMode()
736-
void setPowerModeInternal(const sp<DisplayDevice>& display, hal::PowerMode mode)
736+
void setPhysicalDisplayPowerMode(const sp<DisplayDevice>& display, hal::PowerMode mode)
737737
REQUIRES(mStateLock, kMainThreadContext);
738738

739739
// Returns the preferred mode for PhysicalDisplayId if the Scheduler has selected one for that

‎services/surfaceflinger/tests/unittests/SchedulerTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ TEST_F(SchedulerTest, registerDisplay) FTL_FAKE_GUARD(kMainThreadContext) {
143143
kDisplay1Mode60->getId()));
144144

145145
// TODO(b/241285191): Restore once VsyncSchedule::getPendingHardwareVsyncState is called by
146-
// Scheduler::setDisplayPowerMode rather than SF::setPowerModeInternal.
146+
// Scheduler::setDisplayPowerMode rather than SF::setPhysicalDisplayPowerMode.
147147
#if 0
148148
// Hardware VSYNC should be disabled for newly registered displays.
149149
EXPECT_CALL(mSchedulerCallback, requestHardwareVsync(kDisplayId2, false)).Times(1);

‎services/surfaceflinger/tests/unittests/SurfaceFlinger_DisplayModeSwitching.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ TEST_F(DisplayModeSwitchingTest, innerXorOuterDisplay) {
415415
EXPECT_THAT(innerDisplay, ModeSettledTo(&dmc(), kModeId60));
416416
EXPECT_THAT(outerDisplay, ModeSettledTo(&dmc(), kModeId120));
417417

418-
mFlinger.setPowerModeInternal(outerDisplay, hal::PowerMode::OFF);
419-
mFlinger.setPowerModeInternal(innerDisplay, hal::PowerMode::ON);
418+
mFlinger.setPhysicalDisplayPowerMode(outerDisplay, hal::PowerMode::OFF);
419+
mFlinger.setPhysicalDisplayPowerMode(innerDisplay, hal::PowerMode::ON);
420420

421421
EXPECT_THAT(innerDisplay, ModeSettledTo(&dmc(), kModeId60));
422422
EXPECT_THAT(outerDisplay, ModeSettledTo(&dmc(), kModeId120));
@@ -446,8 +446,8 @@ TEST_F(DisplayModeSwitchingTest, innerXorOuterDisplay) {
446446
EXPECT_THAT(innerDisplay, ModeSettledTo(&dmc(), kModeId90));
447447
EXPECT_THAT(outerDisplay, ModeSettledTo(&dmc(), kModeId60));
448448

449-
mFlinger.setPowerModeInternal(innerDisplay, hal::PowerMode::OFF);
450-
mFlinger.setPowerModeInternal(outerDisplay, hal::PowerMode::ON);
449+
mFlinger.setPhysicalDisplayPowerMode(innerDisplay, hal::PowerMode::OFF);
450+
mFlinger.setPhysicalDisplayPowerMode(outerDisplay, hal::PowerMode::ON);
451451

452452
EXPECT_THAT(innerDisplay, ModeSettledTo(&dmc(), kModeId90));
453453
EXPECT_THAT(outerDisplay, ModeSettledTo(&dmc(), kModeId60));
@@ -479,8 +479,8 @@ TEST_F(DisplayModeSwitchingTest, innerAndOuterDisplay) {
479479
EXPECT_THAT(innerDisplay, ModeSettledTo(&dmc(), kModeId60));
480480
EXPECT_THAT(outerDisplay, ModeSettledTo(&dmc(), kModeId120));
481481

482-
mFlinger.setPowerModeInternal(innerDisplay, hal::PowerMode::ON);
483-
mFlinger.setPowerModeInternal(outerDisplay, hal::PowerMode::ON);
482+
mFlinger.setPhysicalDisplayPowerMode(innerDisplay, hal::PowerMode::ON);
483+
mFlinger.setPhysicalDisplayPowerMode(outerDisplay, hal::PowerMode::ON);
484484

485485
EXPECT_THAT(innerDisplay, ModeSettledTo(&dmc(), kModeId60));
486486
EXPECT_THAT(outerDisplay, ModeSettledTo(&dmc(), kModeId120));
@@ -522,7 +522,7 @@ TEST_F(DisplayModeSwitchingTest, powerOffDuringModeSet) {
522522
EXPECT_THAT(mDisplay, ModeSwitchingTo(&mFlinger, kModeId90));
523523

524524
// Power off the display before the mode has been set.
525-
mFlinger.setPowerModeInternal(mDisplay, hal::PowerMode::OFF);
525+
mFlinger.setPhysicalDisplayPowerMode(mDisplay, hal::PowerMode::OFF);
526526

527527
const VsyncPeriodChangeTimeline timeline{.refreshRequired = true};
528528
EXPECT_SET_ACTIVE_CONFIG(kInnerDisplayHwcId, kModeId90);
@@ -547,8 +547,8 @@ TEST_F(DisplayModeSwitchingTest, powerOffDuringConcurrentModeSet) {
547547
EXPECT_THAT(innerDisplay, ModeSettledTo(&dmc(), kModeId60));
548548
EXPECT_THAT(outerDisplay, ModeSettledTo(&dmc(), kModeId120));
549549

550-
mFlinger.setPowerModeInternal(innerDisplay, hal::PowerMode::ON);
551-
mFlinger.setPowerModeInternal(outerDisplay, hal::PowerMode::ON);
550+
mFlinger.setPhysicalDisplayPowerMode(innerDisplay, hal::PowerMode::ON);
551+
mFlinger.setPhysicalDisplayPowerMode(outerDisplay, hal::PowerMode::ON);
552552

553553
EXPECT_THAT(innerDisplay, ModeSettledTo(&dmc(), kModeId60));
554554
EXPECT_THAT(outerDisplay, ModeSettledTo(&dmc(), kModeId120));
@@ -565,7 +565,7 @@ TEST_F(DisplayModeSwitchingTest, powerOffDuringConcurrentModeSet) {
565565
EXPECT_THAT(outerDisplay, ModeSwitchingTo(&mFlinger, kModeId60));
566566

567567
// Power off the outer display before the mode has been set.
568-
mFlinger.setPowerModeInternal(outerDisplay, hal::PowerMode::OFF);
568+
mFlinger.setPhysicalDisplayPowerMode(outerDisplay, hal::PowerMode::OFF);
569569

570570
const VsyncPeriodChangeTimeline timeline{.refreshRequired = true};
571571
EXPECT_SET_ACTIVE_CONFIG(kInnerDisplayHwcId, kModeId90);
@@ -582,8 +582,8 @@ TEST_F(DisplayModeSwitchingTest, powerOffDuringConcurrentModeSet) {
582582
EXPECT_THAT(innerDisplay, ModeSettledTo(&dmc(), kModeId90));
583583
EXPECT_THAT(outerDisplay, ModeSettledTo(&dmc(), kModeId60));
584584

585-
mFlinger.setPowerModeInternal(innerDisplay, hal::PowerMode::OFF);
586-
mFlinger.setPowerModeInternal(outerDisplay, hal::PowerMode::ON);
585+
mFlinger.setPhysicalDisplayPowerMode(innerDisplay, hal::PowerMode::OFF);
586+
mFlinger.setPhysicalDisplayPowerMode(outerDisplay, hal::PowerMode::ON);
587587

588588
EXPECT_EQ(NO_ERROR,
589589
mFlinger.setDesiredDisplayModeSpecs(outerDisplay->getDisplayToken().promote(),

‎services/surfaceflinger/tests/unittests/SurfaceFlinger_FoldableTest.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,30 +38,30 @@ TEST_F(FoldableTest, promotesPacesetterOnBoot) {
3838
ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), kInnerDisplayId);
3939

4040
// ...and should still be after powering on.
41-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
41+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
4242
ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), kInnerDisplayId);
4343
}
4444

4545
TEST_F(FoldableTest, promotesPacesetterOnFoldUnfold) {
46-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
46+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
4747

4848
// The outer display should become the pacesetter after folding.
49-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::OFF);
50-
mFlinger.setPowerModeInternal(mOuterDisplay, PowerMode::ON);
49+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::OFF);
50+
mFlinger.setPhysicalDisplayPowerMode(mOuterDisplay, PowerMode::ON);
5151
ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), kOuterDisplayId);
5252

5353
// The inner display should become the pacesetter after unfolding.
54-
mFlinger.setPowerModeInternal(mOuterDisplay, PowerMode::OFF);
55-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
54+
mFlinger.setPhysicalDisplayPowerMode(mOuterDisplay, PowerMode::OFF);
55+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
5656
ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), kInnerDisplayId);
5757
}
5858

5959
TEST_F(FoldableTest, promotesPacesetterOnConcurrentPowerOn) {
60-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
60+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
6161

6262
// The inner display should stay the pacesetter if both are powered on.
6363
// TODO(b/255635821): The pacesetter should depend on the displays' refresh rates.
64-
mFlinger.setPowerModeInternal(mOuterDisplay, PowerMode::ON);
64+
mFlinger.setPhysicalDisplayPowerMode(mOuterDisplay, PowerMode::ON);
6565
ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), kInnerDisplayId);
6666

6767
// The outer display should become the pacesetter if designated.
@@ -74,20 +74,20 @@ TEST_F(FoldableTest, promotesPacesetterOnConcurrentPowerOn) {
7474
}
7575

7676
TEST_F(FoldableTest, promotesPacesetterOnConcurrentPowerOff) {
77-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
78-
mFlinger.setPowerModeInternal(mOuterDisplay, PowerMode::ON);
77+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
78+
mFlinger.setPhysicalDisplayPowerMode(mOuterDisplay, PowerMode::ON);
7979

8080
// The outer display should become the pacesetter if the inner display powers off.
81-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::OFF);
81+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::OFF);
8282
ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), kOuterDisplayId);
8383

8484
// The outer display should stay the pacesetter if both are powered on.
8585
// TODO(b/255635821): The pacesetter should depend on the displays' refresh rates.
86-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
86+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
8787
ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), kOuterDisplayId);
8888

8989
// The inner display should become the pacesetter if the outer display powers off.
90-
mFlinger.setPowerModeInternal(mOuterDisplay, PowerMode::OFF);
90+
mFlinger.setPhysicalDisplayPowerMode(mOuterDisplay, PowerMode::OFF);
9191
ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), kInnerDisplayId);
9292
}
9393

@@ -114,8 +114,8 @@ TEST_F(FoldableTest, requestsHardwareVsyncForInnerDisplay) {
114114
.Times(0);
115115

116116
// The injected VsyncSchedule uses TestableScheduler::mockRequestHardwareVsync, so no calls to
117-
// ISchedulerCallback::requestHardwareVsync are expected during setPowerModeInternal.
118-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
117+
// ISchedulerCallback::requestHardwareVsync are expected during setPhysicalDisplayPowerMode.
118+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
119119

120120
EXPECT_TRUE(mInnerDisplay->isPoweredOn());
121121
EXPECT_FALSE(mOuterDisplay->isPoweredOn());
@@ -133,10 +133,10 @@ TEST_F(FoldableTest, requestsHardwareVsyncForOuterDisplay) {
133133
.Times(1);
134134

135135
// The injected VsyncSchedule uses TestableScheduler::mockRequestHardwareVsync, so no calls to
136-
// ISchedulerCallback::requestHardwareVsync are expected during setPowerModeInternal.
137-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
138-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::OFF);
139-
mFlinger.setPowerModeInternal(mOuterDisplay, PowerMode::ON);
136+
// ISchedulerCallback::requestHardwareVsync are expected during setPhysicalDisplayPowerMode.
137+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
138+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::OFF);
139+
mFlinger.setPhysicalDisplayPowerMode(mOuterDisplay, PowerMode::ON);
140140

141141
EXPECT_FALSE(mInnerDisplay->isPoweredOn());
142142
EXPECT_TRUE(mOuterDisplay->isPoweredOn());
@@ -154,9 +154,9 @@ TEST_F(FoldableTest, requestsHardwareVsyncForBothDisplays) {
154154
.Times(1);
155155

156156
// The injected VsyncSchedule uses TestableScheduler::mockRequestHardwareVsync, so no calls to
157-
// ISchedulerCallback::requestHardwareVsync are expected during setPowerModeInternal.
158-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
159-
mFlinger.setPowerModeInternal(mOuterDisplay, PowerMode::ON);
157+
// ISchedulerCallback::requestHardwareVsync are expected during setPhysicalDisplayPowerMode.
158+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
159+
mFlinger.setPhysicalDisplayPowerMode(mOuterDisplay, PowerMode::ON);
160160

161161
EXPECT_TRUE(mInnerDisplay->isPoweredOn());
162162
EXPECT_TRUE(mOuterDisplay->isPoweredOn());
@@ -173,8 +173,8 @@ TEST_F(FoldableTest, requestVsyncOnPowerOn) {
173173
EXPECT_CALL(mFlinger.scheduler()->mockRequestHardwareVsync, Call(kOuterDisplayId, true))
174174
.Times(1);
175175

176-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
177-
mFlinger.setPowerModeInternal(mOuterDisplay, PowerMode::ON);
176+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
177+
mFlinger.setPhysicalDisplayPowerMode(mOuterDisplay, PowerMode::ON);
178178
}
179179

180180
TEST_F(FoldableTest, disableVsyncOnPowerOffPacesetter) {
@@ -192,10 +192,10 @@ TEST_F(FoldableTest, disableVsyncOnPowerOffPacesetter) {
192192
EXPECT_CALL(mFlinger.scheduler()->mockRequestHardwareVsync, Call(kInnerDisplayId, false))
193193
.Times(1);
194194

195-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::ON);
196-
mFlinger.setPowerModeInternal(mOuterDisplay, PowerMode::ON);
195+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::ON);
196+
mFlinger.setPhysicalDisplayPowerMode(mOuterDisplay, PowerMode::ON);
197197

198-
mFlinger.setPowerModeInternal(mInnerDisplay, PowerMode::OFF);
198+
mFlinger.setPhysicalDisplayPowerMode(mInnerDisplay, PowerMode::OFF);
199199

200200
// Other display is now the pacesetter.
201201
ASSERT_EQ(mFlinger.scheduler()->pacesetterDisplayId(), kOuterDisplayId);

0 commit comments

Comments
 (0)