Merge changes I51839f56,I821c42c3,I77ac3f77,I91afd69d am: 8b90646c99

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1498624

Change-Id: I898f74b08d8d560aa8e1369037cc4623b700e61b

1 files changed, 1 insertions, 1 deletions

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index 6d728dc6b1..35e642deb2 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -310,7 +310,7 @@ sp<IBinder> ServiceManagerShim::waitForService(const String16& name16)
     // Simple RAII object to ensure a function call immediately before going out of scope
     class Defer {
     public:
-        Defer(std::function<void()>&& f) : mF(std::move(f)) {}
+        explicit Defer(std::function<void()>&& f) : mF(std::move(f)) {}
         ~Defer() { mF(); }
     private:
         std::function<void()> mF;