| commit | 1233d19faf748a3c4bc07acffe2914a3b70d1854 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Aug 11 22:44:58 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 11 22:44:58 2022 +0000 |
| tree | 29137d338ee258d549d317e0c2973f758f62df51 | |
| parent | 5db60ed00a909ba67c49dbc7a4fe919428205307 [diff] | |
| parent | 3b95e48e60215dec9e523e4e798b80cd31f07ee7 [diff] |
Merge "Fix -Wdefaulted-function-deleted warnings." am: d74da324d7 am: 34b7973fba am: 3b95e48e60 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2176531 Change-Id: I6a4a06a410343524243b9754a24c5c23e6f69606 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;