diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-04-25 19:53:06 +0000 |
|---|---|---|
| committer | Rob Seymour <rseymour@google.com> | 2021-05-06 22:32:25 +0000 |
| commit | afbe732519a96ff0a42a1c98bd59fd04080b4a96 (patch) | |
| tree | 9ca836d438ca47756e4761ee4b844b85bd7e8857 /services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp | |
| parent | 7a303d6e8135bbd0a32075986c9f7083e0fbef23 (diff) | |
| parent | 7132116dfd8bdb9c5b505db8d8a27526a4e889d8 (diff) | |
Merge SP1A.210425.001
Change-Id: I219cc0af128876534b77a72c36979fa1fe08ba13
Diffstat (limited to 'services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp')
| -rw-r--r-- | services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp b/services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp index 0bb7e31194..c088ddc971 100644 --- a/services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp +++ b/services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp @@ -153,11 +153,8 @@ void SetFrameRateTest::removeChild(sp<Layer> layer, sp<Layer> child) { void SetFrameRateTest::commitTransaction() { for (auto layer : mLayers) { - layer->pushPendingState(); auto c = layer->getCurrentState(); - if (layer->applyPendingStates(&c)) { - layer->commitTransaction(c); - } + layer->commitTransaction(c); } } |