Merge "std::move member initializer lists" into main

class AccessorProvider {

class AccessorProvider {

public:

public:

    AccessorProvider(RpcAccessorProvider&& provider) : mProvider(provider) {}

    AccessorProvider(RpcAccessorProvider&& provider) : mProvider(std::move(provider)) {}

    sp<IBinder> provide(const String16& name) { return mProvider(name); }

    sp<IBinder> provide(const String16& name) { return mProvider(name); }

private:

private:

class AccessorProviderEntry {

class AccessorProviderEntry {

public:

public:

    AccessorProviderEntry(std::shared_ptr<AccessorProvider>&& provider) : mProvider(provider) {}

    AccessorProviderEntry(std::shared_ptr<AccessorProvider>&& provider)

          : mProvider(std::move(provider)) {}

    std::shared_ptr<AccessorProvider> mProvider;

    std::shared_ptr<AccessorProvider> mProvider;

private:

private:

class LocalAccessor : public android::os::BnAccessor {

class LocalAccessor : public android::os::BnAccessor {

public:

public:

    LocalAccessor(const String16& instance, RpcSocketAddressProvider&& connectionInfoProvider)

    LocalAccessor(const String16& instance, RpcSocketAddressProvider&& connectionInfoProvider)

          : mInstance(instance), mConnectionInfoProvider(connectionInfoProvider) {

          : mInstance(instance), mConnectionInfoProvider(std::move(connectionInfoProvider)) {

        LOG_ALWAYS_FATAL_IF(!mConnectionInfoProvider,

        LOG_ALWAYS_FATAL_IF(!mConnectionInfoProvider,

                            "LocalAccessor object needs a valid connection info provider");

                            "LocalAccessor object needs a valid connection info provider");

    }

    }

    std::lock_guard<std::mutex> lock(gAccessorProvidersMutex);

    std::lock_guard<std::mutex> lock(gAccessorProvidersMutex);

    std::shared_ptr<AccessorProvider> provider =

    std::shared_ptr<AccessorProvider> provider =

            std::make_shared<AccessorProvider>(std::move(providerCallback));

            std::make_shared<AccessorProvider>(std::move(providerCallback));

    std::weak_ptr<AccessorProvider> receipt = provider;

    gAccessorProviders.push_back(AccessorProviderEntry(std::move(provider)));

    gAccessorProviders.push_back(AccessorProviderEntry(std::move(provider)));

    return provider;

    return receipt;

}

}

status_t removeAccessorProvider(std::weak_ptr<AccessorProvider> wProvider) {

status_t removeAccessorProvider(std::weak_ptr<AccessorProvider> wProvider) {