GitLab

* commit 'db6002a8':

Change-Id: Ia6abae6e625e0ea37abc4d9499c9d96ae705d979

* commit '531f9c1c':
  Check for proper SE open return values on wipe.

* commit '2b4dc11f':
  Check for proper SE open return values on wipe.

Bug: 9227578
Change-Id: Iff9e9512ac4d8e25a287ce40fba7c2717b4419fa

* commit '1bb6d087':

Change-Id: I4dc32b5e3d732a59d90b0594c589a36479abf6ce

* commit '061ed109':
  Use top activity when determining foreground package.

* commit '2f61bcad':
  Use top activity when determining foreground package.

If you have an activity stack where the base activity
belongs to a different package, NfcService would use
the wrong package for determining whether the current
foreground app is allowed to have an ndef message (callback) set.
This could cause Activity stacks like Settings -> Storage ->
Pictures & Videos -> Gallery to fail sending pictures.

Use the top activity instead.

Bug: 9072009
Change-Id: I32fbbea1423333117d2a0522eced98ecf9a758e7

* commit 'ad70e059':

Change-Id: I0d344aca0bfc8aa04e287d39bf09d52254460484

* commit 'db504cc9':
  Broadcast LLCP events in debug builds.

* commit '5cb16e95':
  Broadcast LLCP events in debug builds.

Bug: 8839848
Change-Id: I01a18b3409da66ab1394c2c196a06a8749b9c72c

* commit '644aecfc':

Change-Id: Id2e1d3f7fd20825c3105896166c328ebe016bbdf

am 7ac7ad5f: am 7d58ff5a: Merge "Use the right icon when sending pictures with Beam." into jb-mr2-dev

* commit '7ac7ad5f':
  Use the right icon when sending pictures with Beam.

* commit '7d58ff5a':
  Use the right icon when sending pictures with Beam.

Bug: 8912227
Change-Id: I9731de68019a90a683b87582536ba7df2a351e49

* commit 'fa5d6ea2':
  Don't overwrite SWP_CFG on SE pipe enable/disable.

* commit 'f5954743':
  Don't overwrite SWP_CFG on SE pipe enable/disable.

Different BCM2079x revisions have different interpretations for
bits in the SWP_CFG config parameter. Instead of overwriting
whatever is there, read the current value, and just set/unset
the bit for UICC_IDLE timeout as desired.

Bug: 8776949
Change-Id: I33807aef1e94cfa6a2f4af0dd6a46dae630d850f

* commit 'bff99bd8':
  Fix more race conditions.

* commit '476ee8a6':
  Fix more race conditions.

In the old NXP JNI:
- We can be in the process of discovering a tag/p2p target
  when we try to configure discovery. In case ConfigureDiscovery
  returns BUSY, don't immediately call abort(), but retry a few
  times.
- Completely disable Tag/P2P discovery *before* opening a pipe
  to the SMX. This avoids nasty races with opening the SMX
  while a P2P/Tag device enters the field.

Bug: 8552749
Change-Id: I433a40c918373c661abda3bc40dd36db7b233245

* commit '445efa72':
  Avoid P2P/SMX race conditions in NXP stack.

* commit '7a499e77':
  Avoid P2P/SMX race conditions in NXP stack.

Google Wallet can trigger off field P2P field events
and initiate communication with the SMX. The NXP stack
appears to contain some tricky race conditions around
opening/closing the SMX close to P2P interactions. For now,
do not allow NFCEE access while a P2P link is still active.

Bug: 8552749
Change-Id: I7acae39bc22cebb5d79a484990dcd3fc5f3dad23

* commit '53b353fb':
  Don't close the NFC-EE pipe immediately on disable.

* commit '3e38dca2':
  Don't close the NFC-EE pipe immediately on disable.