diff --git a/include/binderwrapper/binder_wrapper.h b/include/binderwrapper/binder_wrapper.h index ccda825b3..a104bff32 100644 --- a/include/binderwrapper/binder_wrapper.h +++ b/include/binderwrapper/binder_wrapper.h @@ -70,7 +70,7 @@ class BinderWrapper { // is currently registered for |binder|, it will be replaced. virtual bool RegisterForDeathNotifications( const sp& binder, - const base::Closure& callback) = 0; + const ::base::Closure& callback) = 0; // Unregisters the callback, if any, for |binder|. virtual bool UnregisterForDeathNotifications(const sp& binder) = 0; diff --git a/include/binderwrapper/stub_binder_wrapper.h b/include/binderwrapper/stub_binder_wrapper.h index 01c96483c..9d4578eb3 100644 --- a/include/binderwrapper/stub_binder_wrapper.h +++ b/include/binderwrapper/stub_binder_wrapper.h @@ -98,7 +98,7 @@ class StubBinderWrapper : public BinderWrapper { const sp& binder) override; sp CreateLocalBinder() override; bool RegisterForDeathNotifications(const sp& binder, - const base::Closure& callback) override; + const ::base::Closure& callback) override; bool UnregisterForDeathNotifications(const sp& binder) override; uid_t GetCallingUid() override; pid_t GetCallingPid() override; @@ -119,7 +119,7 @@ class StubBinderWrapper : public BinderWrapper { // Map from binder handle to the callback that should be invoked on binder // death. - std::map, base::Closure> death_callbacks_; + std::map, ::base::Closure> death_callbacks_; // Values to return from GetCallingUid() and GetCallingPid(); uid_t calling_uid_; diff --git a/libbinderwrapper/real_binder_wrapper.cc b/libbinderwrapper/real_binder_wrapper.cc index 1c518226d..f93f1837d 100644 --- a/libbinderwrapper/real_binder_wrapper.cc +++ b/libbinderwrapper/real_binder_wrapper.cc @@ -29,7 +29,7 @@ namespace android { // be awkward. class RealBinderWrapper::DeathRecipient : public IBinder::DeathRecipient { public: - explicit DeathRecipient(const base::Closure& callback) + explicit DeathRecipient(const ::base::Closure& callback) : callback_(callback) {} ~DeathRecipient() = default; @@ -40,7 +40,7 @@ class RealBinderWrapper::DeathRecipient : public IBinder::DeathRecipient { private: // Callback to run in response to binder death. - base::Closure callback_; + ::base::Closure callback_; DISALLOW_COPY_AND_ASSIGN(DeathRecipient); }; @@ -85,7 +85,7 @@ sp RealBinderWrapper::CreateLocalBinder() { bool RealBinderWrapper::RegisterForDeathNotifications( const sp& binder, - const base::Closure& callback) { + const ::base::Closure& callback) { sp recipient(new DeathRecipient(callback)); if (binder->linkToDeath(recipient) != OK) { LOG(ERROR) << "Failed to register for death notifications on " diff --git a/libbinderwrapper/real_binder_wrapper.h b/libbinderwrapper/real_binder_wrapper.h index ea0837171..1675432f3 100644 --- a/libbinderwrapper/real_binder_wrapper.h +++ b/libbinderwrapper/real_binder_wrapper.h @@ -36,7 +36,7 @@ class RealBinderWrapper : public BinderWrapper { const sp& binder) override; sp CreateLocalBinder() override; bool RegisterForDeathNotifications(const sp& binder, - const base::Closure& callback) override; + const ::base::Closure& callback) override; bool UnregisterForDeathNotifications(const sp& binder) override; uid_t GetCallingUid() override; pid_t GetCallingPid() override; diff --git a/libbinderwrapper/stub_binder_wrapper.cc b/libbinderwrapper/stub_binder_wrapper.cc index 87c6ab793..8e75f6239 100644 --- a/libbinderwrapper/stub_binder_wrapper.cc +++ b/libbinderwrapper/stub_binder_wrapper.cc @@ -64,7 +64,7 @@ sp StubBinderWrapper::CreateLocalBinder() { bool StubBinderWrapper::RegisterForDeathNotifications( const sp& binder, - const base::Closure& callback) { + const ::base::Closure& callback) { death_callbacks_[binder] = callback; return true; }