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

Commit 1d51e903 authored by Chris Phoenix's avatar Chris Phoenix Committed by android-build-merger
Browse files

Nfc HAL uses "default" service name 

am: 3b06b22e

Change-Id: Ia826e0e8f01766f2a1395ba742f798b42af99b23
parents df335ff2 3b06b22e

nfc/1.0/default/Nfc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ INfc* HIDL_FETCH_INfc(const char * /*name*/) { 
        }

    }

    else

        ALOGE ("hw_get_module failed: %d", ret);

        ALOGE ("hw_get_module %s failed: %d", NFC_NCI_HARDWARE_MODULE_ID, ret);



    if (ret == 0) {

        return new Nfc(nfc_device);

nfc/1.0/default/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -9,5 +9,5 @@ using android::hardware::nfc::V1_0::INfc; 
using android::hardware::defaultPassthroughServiceImplementation;



int main() {

    return defaultPassthroughServiceImplementation<INfc>("nfc_nci");

    return defaultPassthroughServiceImplementation<INfc>();

}

nfc/1.0/vts/functional/nfc_hidl_hal_test.cpp

+1 −3
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ using ::android::hardware::Void; 
using ::android::hardware::hidl_vec;

using ::android::sp;



#define NFC_NCI_SERVICE_NAME "nfc_nci"



/* NCI Commands */

#define CORE_RESET_CMD \

  { 0x20, 0x00, 0x01, 0x00 }
@@ -61,7 +59,7 @@ static bool passthrough = true; 
class NfcHidlTest : public ::testing::Test {

 public:

  virtual void SetUp() override {

    nfc_ = INfc::getService(NFC_NCI_SERVICE_NAME, passthrough);

    nfc_ = INfc::getService(passthrough);

    ASSERT_NE(nfc_, nullptr);



    nfc_cb_ = new NfcClientCallback(*this);

nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ class NfcHidlBasicTest(base_test_with_webdb.BaseTestWithWebDbClass): 
            target_version=1.0,

            target_package="android.hardware.nfc",

            target_component_name="INfc",

            hw_binder_service_name="nfc_nci",

            bits=64 if self.dut.is64Bit else 32)



    def tearDownClass(self):