Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ieee9b73eaf1313ba6307349f72a7d16d980c89d8
am ba040759: Fix wrong extern variable size

* commit 'ba0407599b6271f47a4e6e6d539522ae5b207287':
  Fix wrong extern variable size
Reconcile with jb-release

Change-Id: I33ff7dfbaeb2e3d39f3235647a4d87fad0d7c57d
Remove some logs in case of abort().

This allows us to see more context of HCI timeout
crashes.

Change-Id: I5cf1f829f3d0db5afd8d2c753fba7c3f8ad70365
am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE).

* commit '144d72d32ae420d5f4b25897a43210f56e287637':
  Remove some logs in case of abort() (DO NOT MERGE).
am 55d095b1: (-s ours) am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE).

* commit '55d095b160d7e11c5061e213ae2e1f365f556745':
  Remove some logs in case of abort() (DO NOT MERGE).
am 42fef9f8: Revert "Added addr field in response of Jewel command"

* commit '42fef9f8aa6d0878cb3f2c050c637afa7f8d8abd':
  Revert "Added addr field in response of Jewel command"
am f888888a: am 42fef9f8: Revert "Added addr field in response of Jewel command"

* commit 'f888888a6278d53192bd00b0665c0d39b3cdb6e0':
  Revert "Added addr field in response of Jewel command"
Reconcile with jb-release

Change-Id: I8d723033a1d479bd9ef5973cb098b488c54c6c62
am b668d06f: Reconcile with jb-release

* commit 'b668d06f9447b613f6e8e65817e12ccd8d2b6225':
  Revert "Added addr field in response of Jewel command"
phFriNfc_OvrHal: fix memcpy overlap

Don't use the API workaround when
OvrHal->TranceiveInfo.sRecvData.buffer == pRecvdata->buffer.
When memcpy overlap detection is enabled, this causes the NFC
process to crash and burn. memcpy is undefined when src=dest.

Bug: 6826770
Change-Id: Iebc8f82a4f86d560e764cef2229a7f86fa642783
phHal4Nfc_ADD: fix memcpy overlap

Don't call memcpy when src==dest. It's undefined.

When memcpy overlap detection is enabled, this causes the NFC
process to crash and burn.

Bug: 6826770
Change-Id: I199af98e453953de288964f47248cb59af4deecb
Support of topaz tag NFC Forum version number 1.1

The latest version of NFC forum Tag type 1 spec is 1.1. This version
number needs to be supported by libnfc to support Topaz tags V1.1 with
dynamic content. Version number is part of capability container which
resides in segment 1 of EEPROM memory of the tag. For older versions of
Tag type 1, NFC device may be backward compatible.

Change-Id: Ibbfa720d2e34c2f2612579e368f31f4a5c66b465
Author: Dejan REBRACA <dejanx.rebraca@intel.com>
Signed-off-by: Dejan REBRACA <dejanx.rebraca@intel.com>
Signed-off-by: Sebastian Niciarz <sebastian.niciarz@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 33236
HCI ANY_OPEN_PIPE on identity management gate crash fix

Apparently, host identity management gate does not support HCI commands
coming from another host (including host controller). This patch fixes
a tombstone when receiving an HCI command from another host, but still
doesn't have a mechanism to treat the command.

Change-Id: Ib72df6bac8f503f2b66998ee6e687ae99c15d17b
Author: Dejan Rebraca <dejanx.rebraca@intel.com>
Signed-off-by: Dejan Rebraca <dejanx.rebraca@intel.com>
Signed-off-by: Sebastian Niciarz <sebastian.niciarz@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 42426
Add support for target-customized NFC stack configuration

This patch allows inclusion of target-customized configuration
of NFC stack.

The target-specific configuration will be stored in a header file,
outside of AOSP. To have it icluded, define TARGET_HAS_NFC_CUSTOM_CONFIG
macro and export your header file using BUILD_COPY_HEADERS macro.

Change-Id: Ifa2d08c2ae8860c3f0690a04c517025892bd4c16
Author: Sebastian Niciarz <sebastian.niciarz@intel.com>
Signed-off-by: Sebastian Niciarz <sebastian.niciarz@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 23071
Merge "Support of topaz tag NFC Forum version number 1.1"
Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"
am 1985108c: Merge "Support of topaz tag NFC Forum version number 1.1"

* commit '1985108ceba65f0b01d5c4c41da49073c5d01230':
  Support of topaz tag NFC Forum version number 1.1
am cbef2c80: Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"

* commit 'cbef2c806acfba5b63963844fccfe3fae975d6bd':
  HCI ANY_OPEN_PIPE on identity management gate crash fix
Merge "Add support for target-customized NFC stack configuration"