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

Commit 7d5c0103 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Cleanup nfc service code." am: a91254d1 am: 8c2e2ce8 

am: 79d81c44

Change-Id: I8e569a47820801212ff45aae8cfbd72ca4af6707
parents 733adade 79d81c44

nfc/1.0/default/service.cpp

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ int main() { 
    const char instance[] = "nfc_nci";

    ALOGI("Retrieving default implementation of instance %s.",

          instance);

    android::sp<INfc> service = INfc::getService(instance, true);

    android::sp<INfc> service = INfc::getService(instance, true /* getStub */);

    if (service.get() == nullptr) {

        ALOGE("INfc::getService returned NULL, exiting");

        return -1;
@@ -35,7 +35,7 @@ int main() { 
          instance, (service->isRemote() ? "REMOTE" : "LOCAL"));

    LOG_FATAL_IF(service->isRemote(), "Implementation is REMOTE!");

    ALOGI("Registering instance %s.", instance);

    service->registerAsService("nfc_nci");

    service->registerAsService(instance);

    ALOGI("Ready.");



    ProcessState::self()->setThreadPoolMaxThreadCount(0);