diff options
| author | 2023-01-19 03:55:33 +0000 | |
|---|---|---|
| committer | 2023-01-19 03:55:33 +0000 | |
| commit | ffab144ef7fd639fa32f9e2f5fcd8c3cfd16d503 (patch) | |
| tree | 8a640cbab9b84642cb7cc2349579fa124ea4cda4 | |
| parent | 8b840bc631edce9448d5d002adce793ac8230126 (diff) | |
| parent | d7a7f9952ef25938b6e5f224cc4bbe6aa80e28ab (diff) | |
Merge "surfaceflinger: fix missing pure virtual declarations." am: f4e70632b9 am: d7a7f9952e
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2392152
Change-Id: I437e66f4d40997cdf92a553313bc1c0f3fdbbe2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/surfaceflinger/FrameTimeline/FrameTimeline.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/FrameTimeline/FrameTimeline.h b/services/surfaceflinger/FrameTimeline/FrameTimeline.h index a2305af554..3611deabce 100644 --- a/services/surfaceflinger/FrameTimeline/FrameTimeline.h +++ b/services/surfaceflinger/FrameTimeline/FrameTimeline.h @@ -314,12 +314,12 @@ public: virtual void parseArgs(const Vector<String16>& args, std::string& result) = 0; // Sets the max number of display frames that can be stored. Called by SF backdoor. - virtual void setMaxDisplayFrames(uint32_t size); + virtual void setMaxDisplayFrames(uint32_t size) = 0; // Computes the historical fps for the provided set of layer IDs // The fps is compted from the linear timeline of present timestamps for DisplayFrames // containing at least one layer ID. - virtual float computeFps(const std::unordered_set<int32_t>& layerIds); + virtual float computeFps(const std::unordered_set<int32_t>& layerIds) = 0; // Restores the max number of display frames to default. Called by SF backdoor. virtual void reset() = 0; |