diff options
| -rw-r--r-- | libs/binder/Android.bp | 1 | ||||
| -rw-r--r-- | libs/binder/IServiceManager.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index f4060a292c..dfeefe983a 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -182,7 +182,6 @@ cc_library { "*", "-google-build-using-namespace", "-google-default-arguments", - "-google-explicit-constructor", "-google-runtime-int", ], } 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; |