Merge "Cleanup nfc service code." am: a91254d196 am: 8c2e2ce86d

am: 79d81c4413

Change-Id: I8e569a47820801212ff45aae8cfbd72ca4af6707
This commit is contained in:
Steven Moreland
2016-10-14 07:57:11 +00:00
committed by android-build-merger

View File

@@ -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);