commit 757396314837c3ebacb1468327195123456df91b
author Steven Moreland <smoreland@google.com> Thu Oct 13 09:33:18 2016 -0700
committer Steven Moreland <smoreland@google.com> Thu Oct 13 09:33:18 2016 -0700
tree 6f092b5bdae8730a36031559ad67c9607eb5e04e
parent a3ba3c359c1b41068661e4279939397da0db46c7

Cleanup nfc service code.

Test: mma
Change-Id: Ie65c5bfde292107bec567a297e86eebf5cd7fa41

nfc/1.0/default/service.cpp

diff --git a/nfc/1.0/default/service.cpp b/nfc/1.0/default/service.cpp
index 8952052..e70388d 100644
--- a/nfc/1.0/default/service.cpp
+++ b/nfc/1.0/default/service.cpp
@@ -26,7 +26,7 @@
     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 @@
           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);