Inconsistent NFC

[Ben0mega]

I have a VZW Samsung S5 with the nightly kltevzw installed. For the past several months of versions (since I have started using CyanogenMod on the device), NFC has not been working with freshly wiped installs (I can press to enable it, and it will uncheck the box in around a second).

NFC does work if I use the nightly klte install (though my Verizon network does not work - I assume this is why kltevzw is different from klte).

It seems like the issue is that some of the NFC code is not shared when it should be.

I would be happy to test any bleeding-edge changes (though I would need to setup a build environment).

(I post this here instead of the JIRA, since it states that it is only for nightly regressions - this is not a regression between subsequent nightlies, but, rather, inconsistent functionality between klte slices).