diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-08-11 22:00:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-11 22:00:51 +0000 |
| commit | 34b7973fbad91988bfc1fb9e7939092bf3699b62 (patch) | |
| tree | e32c8ebf5bcbd57639a0e1898a16e1b461979154 | |
| parent | 99a3b082f2e9d018e48cda359935519a4ba879a4 (diff) | |
| parent | d74da324d70db7dd815080f7689a7efdb58251a0 (diff) | |
| download | native-34b7973fbad91988bfc1fb9e7939092bf3699b62.tar.gz | |
Merge "Fix -Wdefaulted-function-deleted warnings." am: d74da324d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2176531
Change-Id: If813269837a6215a5fe41a6be660c449d7832891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/vibrator/include/vibrator/ExternalVibration.h | 1 | ||||
| -rw-r--r-- | services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/libs/vibrator/include/vibrator/ExternalVibration.h b/libs/vibrator/include/vibrator/ExternalVibration.h index c6eb3d102b..760dbce149 100644 --- a/libs/vibrator/include/vibrator/ExternalVibration.h +++ b/libs/vibrator/include/vibrator/ExternalVibration.h @@ -33,7 +33,6 @@ public : ExternalVibration(int32_t uid, std::string pkg, const audio_attributes_t& attrs, sp<IExternalVibrationController> controller); virtual ~ExternalVibration() = default; - ExternalVibration(const ExternalVibration&) = default; bool operator==(const ExternalVibration&) const; diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h index e65aa7393c..2bfd3cfb1f 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h @@ -150,8 +150,6 @@ public: bool hasSolidColorLayers() const; private: - CachedSet() = default; - const NonBufferHash mFingerprint; std::chrono::steady_clock::time_point mLastUpdate = std::chrono::steady_clock::now(); std::vector<Layer> mLayers; |