Merge "Add plumbing for upcoming setFrameRate() api"

1 files changed, 6 insertions, 4 deletions

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 8b448ff3f6..39b4d4bbb6 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -110,9 +110,8 @@ status_t layer_state_t::write(Parcel& output) const
         }
     }
     output.writeFloat(shadowRadius);
-
     output.writeInt32(frameRateSelectionPriority);
-
+    output.writeFloat(frameRate);
     return NO_ERROR;
 }
 
@@ -191,9 +190,8 @@ status_t layer_state_t::read(const Parcel& input)
         listeners.emplace_back(listener, callbackIds);
     }
     shadowRadius = input.readFloat();
-
     frameRateSelectionPriority = input.readInt32();
-
+    frameRate = input.readFloat();
     return NO_ERROR;
 }
 
@@ -420,6 +418,10 @@ void layer_state_t::merge(const layer_state_t& other) {
         what |= eFrameRateSelectionPriority;
         frameRateSelectionPriority = other.frameRateSelectionPriority;
     }
+    if (other.what & eFrameRateChanged) {
+        what |= eFrameRateChanged;
+        frameRate = other.frameRate;
+    }
     if ((other.what & what) != other.what) {
         ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating? "
               "other.what=0x%" PRIu64 " what=0x%" PRIu64,