commit 46f3e3b68fe01e23b1c903ed11b75d0c8efd774d
author Dominik Laskowski <domlaskowski@google.com> Tue Aug 10 11:44:24 2021 -0700
committer Dominik Laskowski <domlaskowski@google.com> Thu Nov 11 14:19:27 2021 -0800
tree 470dc17dfcc29bf88059501b79c0e0d6dc7294ef
parent 3ecdfeafa3df304f6e91dc5f3d75bf0e467958aa

SF: Merge commit/composite in MessageQueue

scheduleComposite is unnecessary, as commit and/or composite are
dispatched from the same message/task.

Bug: 185535769
Test: libsurfaceflinger_unittest
Change-Id: I8de8b89d9311049598165a46a30ddbf6a4d0c8d4

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 93f8406..4c90a04 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1702,7 +1702,7 @@
         mScheduler->resetIdleTimer();
     }
     mPowerAdvisor.notifyDisplayUpdateImminent();
-    mScheduler->scheduleCommit();
+    mScheduler->scheduleFrame();
 }
 
 void SurfaceFlinger::scheduleComposite(FrameHint hint) {
@@ -1928,7 +1928,7 @@
     // fired yet just wait for the next commit.
     if (mSetActiveModePending) {
         if (framePending) {
-            mScheduler->scheduleCommit();
+            mScheduler->scheduleFrame();
             return false;
         }
 
@@ -5324,6 +5324,7 @@
                 scheduleRepaint();
                 return NO_ERROR;
             case 1004: // Force composite ahead of next VSYNC.
+            case 1006:
                 scheduleComposite(FrameHint::kActive);
                 return NO_ERROR;
             case 1005: { // Force commit ahead of next VSYNC.
@@ -5332,9 +5333,6 @@
                                     eTraversalNeeded);
                 return NO_ERROR;
             }
-            case 1006: // Force composite immediately.
-                mScheduler->scheduleComposite();
-                return NO_ERROR;
             case 1007: // Unused.
                 return NAME_NOT_FOUND;
             case 1008: // Toggle forced GPU composition.
@@ -5752,7 +5750,7 @@
         const bool timerExpired = mKernelIdleTimerEnabled && expired;
 
         if (display->onKernelTimerChanged(desiredModeId, timerExpired)) {
-            mScheduler->scheduleCommit();
+            mScheduler->scheduleFrame();
         }
     }));
 }