| commit | 34b7973fbad91988bfc1fb9e7939092bf3699b62 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Aug 11 22:00:51 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 11 22:00:51 2022 +0000 |
| tree | e32c8ebf5bcbd57639a0e1898a16e1b461979154 | |
| parent | 99a3b082f2e9d018e48cda359935519a4ba879a4 [diff] | |
| parent | d74da324d70db7dd815080f7689a7efdb58251a0 [diff] |
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>
diff --git a/libs/vibrator/include/vibrator/ExternalVibration.h b/libs/vibrator/include/vibrator/ExternalVibration.h index c6eb3d1..760dbce 100644 --- a/libs/vibrator/include/vibrator/ExternalVibration.h +++ b/libs/vibrator/include/vibrator/ExternalVibration.h
@@ -33,7 +33,6 @@ 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 e65aa73..2bfd3cf 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 @@ 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;