commit 70072fd16fb0c4a893bf69836a80f1a673f5286e
author Jiyong Park <jiyong@google.com> Fri Nov 13 17:19:14 2020 +0900
committer Jiyong Park <jiyong@google.com> Mon Nov 16 19:43:52 2020 +0900
tree 6725fcd9b271252eb81d96bf0db8b4e93a932ac7
parent 384328e986dd3684b00fd5d6bfd04a3de77a2c2e

binder: fix google-explicit-constructor

Bug: 162909698
Test: m libbinder

Change-Id: I77ac3f7783ee0fe675c5ab42610eda25c4d51378

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index f4060a2..dfeefe9 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -182,7 +182,6 @@
         "*",
         "-google-build-using-namespace",
         "-google-default-arguments",
-        "-google-explicit-constructor",
         "-google-runtime-int",
     ],
 }

libs/binder/IServiceManager.cpp

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index 6d728dc..35e642d 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -310,7 +310,7 @@
     // 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;