commit d078383b4681079d5aa8b521913523df1ca2799a
author Chris Phoenix <cphoenix@google.com> Sat Jan 14 10:29:11 2017 -0800
committer Rohit Rangwani <rrangwan@codeaurora.org> Mon Apr 17 14:08:39 2017 +0530
tree 5fa6b5db5ef8ec55802bccf4c0efe56c8325b6a1
parent 519a8c8dca19d5df147ec424326a2d7da596e1cc

Nfc HAL uses "default" service name

The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds; verify HAL still works

In support of b/33844934

Change-Id: Ia7ec0cd510e293decb5a25a229e91053ae053502
(cherry picked from commit 950638a8a1aad185108cb6ade37814fff092e73a)

src/adaptation/NfcAdaptation.cpp

diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp
index 6011ad6..169881f 100644
--- a/src/adaptation/NfcAdaptation.cpp
+++ b/src/adaptation/NfcAdaptation.cpp
@@ -81,7 +81,6 @@
 UINT8 appl_dta_mode_flag = 0x00;
 #endif
 char bcm_nfc_location[120];
-char nci_hal_module[64];
 
 static UINT8 nfa_dm_cfg[sizeof ( tNFA_DM_CFG ) ];
 static UINT8 nfa_proprietary_cfg[sizeof ( tNFA_PROPRIETARY_CFG )];
@@ -402,16 +401,6 @@
     const char* func = "NfcAdaptation::InitializeHalDeviceContext";
     ALOGD ("%s: enter", func);
     int ret = 0; //0 means success
-    if ( !GetStrValue ( NAME_NCI_HAL_MODULE, nci_hal_module, sizeof ( nci_hal_module) ) )
-    {
-#if(NXP_EXTNS == TRUE)
-    ALOGE("No HAL module specified in config, falling back to nqx");
-    strlcpy (nci_hal_module, "nfc_nci.nqx", sizeof(nci_hal_module));
-#else
-    ALOGE("No HAL module specified in config, falling back to BCM2079x");
-    strlcpy (nci_hal_module, "nfc_nci.bcm2079x", sizeof(nci_hal_module));
-#endif
-    }
 
     mHalEntryFuncs.initialize = HalInitialize;
     mHalEntryFuncs.terminate = HalTerminate;
@@ -426,10 +415,10 @@
     mHalEntryFuncs.control_granted = HalControlGranted;
     mHalEntryFuncs.power_cycle = HalPowerCycle;
     mHalEntryFuncs.get_max_ee = HalGetMaxNfcee;
-    ALOGI("%s: INfc::getService(%s)", func, nci_hal_module);
-    mHal = INfc::getService(nci_hal_module);
+    ALOGI("%s: INfc::getService()", func);
+    mHal = INfc::getService();
     LOG_FATAL_IF(mHal == nullptr, "Failed to retrieve the NFC HAL!");
-    ALOGI("%s: INfc::getService(%s) returned %p (%s)", func, nci_hal_module,
+    ALOGI("%s: INfc::getService() returned %p (%s)", func,
           mHal.get(), (mHal->isRemote() ? "remote" : "local"));
     ALOGD ("%s: exit", func);
 }