Loading libs/binder/IServiceManager.cpp +6 −4 Original line number Diff line number Diff line Loading @@ -157,7 +157,7 @@ protected: class AccessorProvider { public: AccessorProvider(RpcAccessorProvider&& provider) : mProvider(provider) {} AccessorProvider(RpcAccessorProvider&& provider) : mProvider(std::move(provider)) {} sp<IBinder> provide(const String16& name) { return mProvider(name); } private: Loading @@ -168,7 +168,8 @@ private: class AccessorProviderEntry { public: AccessorProviderEntry(std::shared_ptr<AccessorProvider>&& provider) : mProvider(provider) {} AccessorProviderEntry(std::shared_ptr<AccessorProvider>&& provider) : mProvider(std::move(provider)) {} std::shared_ptr<AccessorProvider> mProvider; private: Loading @@ -183,7 +184,7 @@ private: class LocalAccessor : public android::os::BnAccessor { public: LocalAccessor(const String16& instance, RpcSocketAddressProvider&& connectionInfoProvider) : mInstance(instance), mConnectionInfoProvider(connectionInfoProvider) { : mInstance(instance), mConnectionInfoProvider(std::move(connectionInfoProvider)) { LOG_ALWAYS_FATAL_IF(!mConnectionInfoProvider, "LocalAccessor object needs a valid connection info provider"); } Loading Loading @@ -321,9 +322,10 @@ std::weak_ptr<AccessorProvider> addAccessorProvider(RpcAccessorProvider&& provid std::lock_guard<std::mutex> lock(gAccessorProvidersMutex); std::shared_ptr<AccessorProvider> provider = std::make_shared<AccessorProvider>(std::move(providerCallback)); std::weak_ptr<AccessorProvider> receipt = provider; gAccessorProviders.push_back(AccessorProviderEntry(std::move(provider))); return provider; return receipt; } status_t removeAccessorProvider(std::weak_ptr<AccessorProvider> wProvider) { Loading Loading
libs/binder/IServiceManager.cpp +6 −4 Original line number Diff line number Diff line Loading @@ -157,7 +157,7 @@ protected: class AccessorProvider { public: AccessorProvider(RpcAccessorProvider&& provider) : mProvider(provider) {} AccessorProvider(RpcAccessorProvider&& provider) : mProvider(std::move(provider)) {} sp<IBinder> provide(const String16& name) { return mProvider(name); } private: Loading @@ -168,7 +168,8 @@ private: class AccessorProviderEntry { public: AccessorProviderEntry(std::shared_ptr<AccessorProvider>&& provider) : mProvider(provider) {} AccessorProviderEntry(std::shared_ptr<AccessorProvider>&& provider) : mProvider(std::move(provider)) {} std::shared_ptr<AccessorProvider> mProvider; private: Loading @@ -183,7 +184,7 @@ private: class LocalAccessor : public android::os::BnAccessor { public: LocalAccessor(const String16& instance, RpcSocketAddressProvider&& connectionInfoProvider) : mInstance(instance), mConnectionInfoProvider(connectionInfoProvider) { : mInstance(instance), mConnectionInfoProvider(std::move(connectionInfoProvider)) { LOG_ALWAYS_FATAL_IF(!mConnectionInfoProvider, "LocalAccessor object needs a valid connection info provider"); } Loading Loading @@ -321,9 +322,10 @@ std::weak_ptr<AccessorProvider> addAccessorProvider(RpcAccessorProvider&& provid std::lock_guard<std::mutex> lock(gAccessorProvidersMutex); std::shared_ptr<AccessorProvider> provider = std::make_shared<AccessorProvider>(std::move(providerCallback)); std::weak_ptr<AccessorProvider> receipt = provider; gAccessorProviders.push_back(AccessorProviderEntry(std::move(provider))); return provider; return receipt; } status_t removeAccessorProvider(std::weak_ptr<AccessorProvider> wProvider) { Loading