diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-03-31 00:49:12 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-03-31 00:49:12 -0700 |
| commit | 310298e2816e5393a85ea10a7661416376cf505d (patch) | |
| tree | 1d6d46c7050aef9c73dff23f1bbbf5f21b3b3ab8 | |
| parent | 666eb75c397f71213ab4a84e2d9eec8fa1170566 (diff) | |
| parent | fa715fbb081b1c548160bbf9b3b483f2e532960c (diff) | |
Merge fa715fbb081b1c548160bbf9b3b483f2e532960c on remote branch
Change-Id: I2fa95e3ecfc3219041352b9c0446f9113da2bbbe
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 1 | ||||
| -rw-r--r-- | services/surfaceflinger/Scheduler/MessageQueue.cpp | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 3c40e12dad..46d88de810 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -136,6 +136,7 @@ Layer::Layer(const LayerCreationArgs& args) mDrawingState.frameTimelineInfo = {}; mDrawingState.postTime = -1; mDrawingState.destinationFrame.makeInvalid(); + mDrawingState.isTrustedOverlay = false; if (args.flags & ISurfaceComposerClient::eNoColorFill) { // Set an invalid color so there is no color fill. diff --git a/services/surfaceflinger/Scheduler/MessageQueue.cpp b/services/surfaceflinger/Scheduler/MessageQueue.cpp index a339375db0..d0182d33a9 100644 --- a/services/surfaceflinger/Scheduler/MessageQueue.cpp +++ b/services/surfaceflinger/Scheduler/MessageQueue.cpp @@ -127,14 +127,11 @@ void MessageQueue::vsyncCallback(nsecs_t vsyncTime, nsecs_t targetWakeupTime, ns SmomoIntf *smoMo = nullptr; for (auto &instance: mFlinger->mSmomoInstances) { - if (instance.displayId == 0) { - smoMo = instance.smoMo; - break; + smoMo = instance.smoMo; + if (smoMo) { + smoMo->OnVsync(vsyncTime); } } - if (smoMo) { - smoMo->OnVsync(vsyncTime); - } mHandler->dispatchInvalidate(mVsync.tokenManager->generateTokenForPredictions( {targetWakeupTime, readyTime, vsyncTime}), |