Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70072fd1 authored by Jiyong Park's avatar Jiyong Park
Browse files

binder: fix google-explicit-constructor 

Bug: 162909698
Test: m libbinder

Change-Id: I77ac3f7783ee0fe675c5ab42610eda25c4d51378
parent 384328e9

libs/binder/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ cc_library { 
        "*",

        "-google-build-using-namespace",

        "-google-default-arguments",

        "-google-explicit-constructor",

        "-google-runtime-int",

    ],

}

libs/binder/IServiceManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;