replicant:packages_apps_nfc.git
7 years agoPower off only when initialization failed replicant-4.2
Paul Kocialkowski [Sun, 3 Aug 2014 19:18:41 +0000 (21:18 +0200)]
Power off only when initialization failed

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
7 years agoNativeNfcManager: Properly unconfigure NFC chip
Paul Kocialkowski [Sun, 29 Jun 2014 22:11:52 +0000 (00:11 +0200)]
NativeNfcManager: Properly unconfigure NFC chip

Change-Id: I8da74ff64579181387b3905c29e5d4dca9e9e7eb
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
8 years agofixed inconsistant defines that are supposed to match tagtechnology.java
doug yeager [Thu, 21 Feb 2013 19:13:14 +0000 (13:13 -0600)]
fixed inconsistant defines that are supposed to match tagtechnology.java

Change-Id: If3afc9a3d46fe3780261d029caac18d242718e38

8 years agoMerge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages...
Steve Kondik [Wed, 13 Feb 2013 06:42:37 +0000 (22:42 -0800)]
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Nfc into 1.1

Android 4.2.2 release 1

8 years agonfc: Add alternate firmware path
Steve Kondik [Wed, 6 Feb 2013 19:40:32 +0000 (11:40 -0800)]
nfc: Add alternate firmware path

 * So we stay bug-for-bug compatible with OEMs.

Change-Id: I0c14568d9f587ebcd2d21c0f0490b705be7ce8ce

9 years agoMerge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages...
Steve Kondik [Thu, 27 Dec 2012 21:07:01 +0000 (13:07 -0800)]
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Nfc into aosp

Conflicts:
nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
src/com/android/nfc/NfcService.java

Change-Id: I52a73c696c003e8ccf513977968a42d917acf87a

9 years agoSnapshot b80adb2c263702442cf2f2d771168400e6ceb9f8
The Android Open Source Project [Fri, 14 Dec 2012 00:44:23 +0000 (16:44 -0800)]
Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8

Change-Id: I391d8e1be1a61e68b01f0db371dbb4ed3e5b5933

9 years agoSnapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01
The Android Open Source Project [Fri, 14 Dec 2012 00:24:26 +0000 (16:24 -0800)]
Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01

Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f

9 years agoMerge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages...
Steve Kondik [Mon, 19 Nov 2012 06:49:42 +0000 (22:49 -0800)]
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Nfc into HEAD

Conflicts:
nxp/jni/com_android_nfc_NativeNfcManager.cpp

Change-Id: Ic84af6ad1cda79984f40e9fc464d2cbaa994b89a

9 years agoNfc: Dutch translations
Kasper Hettinga [Tue, 6 Nov 2012 18:36:07 +0000 (19:36 +0100)]
Nfc: Dutch translations

As discussed here: http://review.cyanogenmod.org/#/c/25947
I changed Bluetooth to bluetooth

Change-Id: If16d9aadba72a2af3387beaa731ffc4b92d1afa2

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 29 Oct 2012 18:20:20 +0000 (11:20 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoSerialize applying card emulation route.
Martijn Coenen [Fri, 26 Oct 2012 03:49:48 +0000 (20:49 -0700)]
Serialize applying card emulation route.

Instead of immediately applying the routing,
serialze the request with any outstanding
commands (including NFC enable/disable). This
prevents race conditions when NFC is being disabled
and the card emu routing gets changed at the same time.

Wait until the AsyncTask is complete, to make sure
that the routing is applied (if possible) by the time
the call returns.

Bug: 7418238
Change-Id: I7d92533179c02f4b6b01a86967737e64532317a1

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 25 Oct 2012 20:42:40 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoHold a wakelock during initialisation.
Martijn Coenen [Wed, 24 Oct 2012 19:35:08 +0000 (12:35 -0700)]
Hold a wakelock during initialisation.

The NCI stack may do firmware download as part
of the intilization call. Make sure we don't
suspend while the download is in progress.

Also, hold a wakelock over the entire EEwipe
procedure. This prevents suspending in the
middle.

Bug: 7407558
Change-Id: I2034c8292414dc7db20a0c19951d44021389adea

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 24 Oct 2012 04:53:04 +0000 (21:53 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoDelay sending EE-wipe APDUs.
Martijn Coenen [Wed, 24 Oct 2012 03:51:03 +0000 (20:51 -0700)]
Delay sending EE-wipe APDUs.

Work around an issue where sending the wipe
APDUs at the same time as the SE sends its
HCI configuration to the NFCC can cause the
persistent HCI state to become incorrect.

Bug: 7387638
Change-Id: I11a73e3ad7875c5b1d755efde0a7a803427b7468

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 23 Oct 2012 21:37:39 +0000 (14:37 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoFix wrong Beam image scaling on sw600 and larger devices.
Martijn Coenen [Tue, 23 Oct 2012 18:43:02 +0000 (11:43 -0700)]
Fix wrong Beam image scaling on sw600 and larger devices.

On sw600 and larger, the navbar is at the bottom,
not to the side.

Bug: 7399926
Change-Id: I825a1156995ec6e84faef16866dea4bf240a11c2

9 years agoReset RF field status on SE activation.
Martijn Coenen [Tue, 23 Oct 2012 00:22:04 +0000 (17:22 -0700)]
Reset RF field status on SE activation.

We've seen the NFCC get in a state where
it continuously reports field off/field on
events. The danger is that the device goes
to sleep right after a field on event. On
wake-up, the field off/field on loop is
gone, and the device prevents any access
to the SE from the DH because it thinks
the field is still present.

Bug: 7386840
Change-Id: I87b681124078fe69c0244efd7b14ebe3ffd1c161

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 00:31:06 +0000 (17:31 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoMerge "Fix Beam animation for non-owner user." into jb-mr1-dev
Martijn Coenen [Tue, 16 Oct 2012 23:02:05 +0000 (16:02 -0700)]
Merge "Fix Beam animation for non-owner user." into jb-mr1-dev

9 years agoam 547b58f4: Fix tag not deactivating to sleep during reconnect.
Evan Chu [Tue, 16 Oct 2012 17:50:30 +0000 (10:50 -0700)]
am 547b58f4: Fix tag not deactivating to sleep during reconnect.

* commit '547b58f41866671e0028ed6f395b34e271ce81b1':
  Fix tag not deactivating to sleep during reconnect.

9 years agoam a15b24e9: Check for invalid handle before configuring secure element.
Evan Chu [Tue, 16 Oct 2012 17:50:29 +0000 (10:50 -0700)]
am a15b24e9: Check for invalid handle before configuring secure element.

* commit 'a15b24e9e405b65b7523d8c80173b1c0d71e093e':
  Check for invalid handle before configuring secure element.

9 years agoFix tag not deactivating to sleep during reconnect.
Evan Chu [Mon, 15 Oct 2012 19:36:14 +0000 (15:36 -0400)]
Fix tag not deactivating to sleep during reconnect.

During reconnect, the JNI deactivates the tag to sleep mode
and re-selects it.  Sometimes when the tag leaves the RF field, it
deactivates to idle instead of sleep; causing subsequent select to fail.

Author: Mark Gorodetzky

Bug: 7357299
Change-Id: Id774d0bc3b8e2cbcea93cd2ee061ffecfa821a1e

9 years agoCheck for invalid handle before configuring secure element.
Evan Chu [Mon, 15 Oct 2012 20:39:47 +0000 (16:39 -0400)]
Check for invalid handle before configuring secure element.

If handle is invalid, don't adjust secure element's listening
parameter.  This prevents a warning message from stack.

Use LLCP_MAX_MIU to prevent a warning message from stack.

Bug: 7357666
Change-Id: I79af30f7d3db1d597b46d8cf43991c9157359e10

9 years agoFix Beam animation for non-owner user.
Martijn Coenen [Tue, 16 Oct 2012 04:07:19 +0000 (21:07 -0700)]
Fix Beam animation for non-owner user.

The Beam animation adds a system window on top
of the current window stack, and does this
from a process run as the owner user.

Added required permission that allows showing the
window for all users.

Also added a glClear() to fix a rendering
glitch on Manta.

Bug: 7351616
Bug: 7310663
Change-Id: I06960ee9d843c2413fcfd36a81bc7161fed5ef98

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 13 Oct 2012 10:50:20 +0000 (03:50 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoDon't hold a timed wakelock.
Martijn Coenen [Fri, 12 Oct 2012 22:06:36 +0000 (15:06 -0700)]
Don't hold a timed wakelock.

We used to acquire a timed wakelock when either resuming
or suspending. We don't want to take a timed wakelock
when suspending, since we want to suspend asap, but also
don't want to underlock the wakelock.

Instead of taking a timed wakelock, just abort
the process in case the NFC controller hangs.

Bug: 7341879
Change-Id: Ibd2f468264f60a39db3cb271a6f05c50dfb559bf

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 23:26:56 +0000 (16:26 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoam a949c743: Fast-fail SE open if it\'s activated in listen mode.
Martijn Coenen [Thu, 11 Oct 2012 23:01:48 +0000 (16:01 -0700)]
am a949c743: Fast-fail SE open if it\'s activated in listen mode.

* commit 'a949c74321b17f8ef1c93692064969f60815c7e4':
  Fast-fail SE open if it's activated in listen mode.

9 years agoam ae1b16cf: (-s ours) Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT...
Paul Chaisson [Thu, 11 Oct 2012 22:25:35 +0000 (15:25 -0700)]
am ae1b16cf: (-s ours) Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)

* commit 'ae1b16cf81e49a438b7a86efcdd8d83c1c0666d1':
  Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)

9 years agoFast-fail SE open if it's activated in listen mode.
Martijn Coenen [Thu, 4 Oct 2012 23:52:51 +0000 (16:52 -0700)]
Fast-fail SE open if it's activated in listen mode.

Users of the NFC-extras API usually want to talk
to the SE once it has completed a transaction.
The hard part is knowing when it is safe to connect
to the SE, as it will break the connection to any
reader. And when relinquishing the connection to
the SE, the reader may find the device again and
process another transaction.

This patch adds the following two conditions
for allowing to open the SE from the DH:

1) The SE may not be activated in listen mode

2) The RF field must have been off for at least 50 ms

Bug: 7275484
Change-Id: Ibde32a8e2aef045c17ab76ef08c72f96edfedaef

9 years agoUse RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)
Paul Chaisson [Wed, 3 Oct 2012 02:28:41 +0000 (22:28 -0400)]
Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)

Create the RF Events for SE transactions based on RF
activations (listen mode and ISO-DEP only).

Bug: 7276275
Change-Id: Ibea0f64ba82ed31a7c582f6a44eb15abf25dda1c

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:46 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 23:07:25 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 22:39:17 +0000 (15:39 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoam accbb8c9: Don\'t return target lost in case of NACK for T2T.
Martijn Coenen [Tue, 9 Oct 2012 22:38:32 +0000 (15:38 -0700)]
am accbb8c9: Don\'t return target lost in case of NACK for T2T.

* commit 'accbb8c908d764c5f0b8030480f3e84f0f319ff5':
  Don't return target lost in case of NACK for T2T.

9 years agoDon't return target lost in case of NACK for T2T.
Martijn Coenen [Tue, 9 Oct 2012 22:21:49 +0000 (15:21 -0700)]
Don't return target lost in case of NACK for T2T.

Causes applications such as TagInfo to report the tag
as being lost. Also fixed a small memory leak triggered
in this case.

Bug: 7294613
Change-Id: I260e02896e534b23de5c7e0278609e27a9a20e7f

9 years agoMerge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages...
Steve Kondik [Tue, 9 Oct 2012 19:35:32 +0000 (12:35 -0700)]
Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Nfc into aosp-merge

9 years agoMerge "NFC changes for multi-user support." into jb-mr1-dev
Martijn Coenen [Tue, 9 Oct 2012 16:55:57 +0000 (09:55 -0700)]
Merge "NFC changes for multi-user support." into jb-mr1-dev

9 years agoSet EE wipe APDUs for NCI stack.
Martijn Coenen [Tue, 9 Oct 2012 06:33:17 +0000 (23:33 -0700)]
Set EE wipe APDUs for NCI stack.

The wipe APDUs are used to lock the Secure Element
state whenever an app using the SE is deinstalled,
when all userdata is removed, or on first boot of
the device. This sequence is identical for both
the NXP and NCI implementations.

Bug: 7312675
Change-Id: I746580985bc986ac159e0d294823f0dbe6d3404f

9 years agoNFC changes for multi-user support.
Martijn Coenen [Fri, 14 Sep 2012 22:01:07 +0000 (15:01 -0700)]
NFC changes for multi-user support.

- Instantiate full NfcService for user 0, light
  NfcApplication instance for other users

- Invalidate component cache on user switch
- Start all activities based on current logged in user
- Query PM based on current logged in user
- Only keep track of apps using the SE for the owner
- Throw SecurityException on SE calls for non-owner users

Bug: 6926465
Change-Id: If686efd34825a1bdd86fc06234ac7402d44a2afa

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 13:59:52 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoam 7bb9229c: Merge "Increase default transceive timeout to SE to 30s." into jb-broadc...
Martijn Coenen [Fri, 5 Oct 2012 17:48:45 +0000 (10:48 -0700)]
am 7bb9229c: Merge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfc

* commit '7bb9229c66e38ce9e3fbb8c5364ca3416e19c5bc':
  Increase default transceive timeout to SE to 30s.

9 years agoam 10dd44d3: NFA_HciAddStaticPipe()\'s parameters changed
Evan Chu [Fri, 5 Oct 2012 17:48:44 +0000 (10:48 -0700)]
am 10dd44d3: NFA_HciAddStaticPipe()\'s parameters changed

* commit '10dd44d39824fbccd8bf26871cb118b1475eb2f1':
  NFA_HciAddStaticPipe()'s parameters changed

9 years agoMerge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfc
Martijn Coenen [Fri, 5 Oct 2012 17:47:38 +0000 (10:47 -0700)]
Merge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfc

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 5 Oct 2012 14:00:11 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoIncrease default transceive timeout to SE to 30s.
Martijn Coenen [Fri, 5 Oct 2012 05:51:38 +0000 (22:51 -0700)]
Increase default transceive timeout to SE to 30s.

We've found that executing some APDU commands
may take longer than the current timeout of 10 seconds.

Increase default transceive timeout to the SE to 30 seconds.

Bug: 7004303
Change-Id: I3e6855e79b7eceae9d2aa18b3f92c3efcdf4a9d6

9 years agoNFA_HciAddStaticPipe()'s parameters changed
Evan Chu [Thu, 4 Oct 2012 20:19:56 +0000 (16:19 -0400)]
NFA_HciAddStaticPipe()'s parameters changed

Bug: 7282057
Change-Id: Ic877f67654906e21f1942adf05751943e3d6cb01

9 years agoUse RF_ACTIVATE/DEACTIVATE to generate RF events.
Paul Chaisson [Wed, 3 Oct 2012 02:28:41 +0000 (22:28 -0400)]
Use RF_ACTIVATE/DEACTIVATE to generate RF events.

Create the RF Events for SE transactions based on RF
activations (listen mode and ISO-DEP only).

Change-Id: Ie8317292b0de05e1a406ca84c48491738acfe271
Bug: 7276275

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 4 Oct 2012 14:00:13 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoon handsets where Gwallet is enabled, HCE turns off for good after Gwallet is fired...
doug yeager [Wed, 26 Sep 2012 15:38:56 +0000 (10:38 -0500)]
on handsets where Gwallet is enabled, HCE turns off for good after Gwallet is fired up.  This patch fixes the scenario of Gwallet and HCE living happily together.  it is a fix, really, for the intended function of when an HCE application is in the forground, it has control, all other times Gwallet gets control of emulation from SE.

Change-Id: I8c37e2799c3a2232f7cc1b18d1b40c6986e98e44

9 years agoMerge "NfcAdapterExtras: add driver name." into jb-mr1-dev
mike wakerly [Wed, 3 Oct 2012 23:47:06 +0000 (16:47 -0700)]
Merge "NfcAdapterExtras: add driver name." into jb-mr1-dev

9 years agoam c7d56f7e: Fix locking around power state.
Evan Chu [Wed, 3 Oct 2012 21:23:59 +0000 (14:23 -0700)]
am c7d56f7e: Fix locking around power state.

* commit 'c7d56f7e340c3c02359cac491e1a02156226975e':
  Fix locking around power state.

9 years agoNfcAdapterExtras: add driver name.
mike wakerly [Wed, 3 Oct 2012 20:08:07 +0000 (13:08 -0700)]
NfcAdapterExtras: add driver name.

Bug: 7276355
Change-Id: If2732afd542a68dc440308dae9eb76eb7ff31e25

9 years agoFix locking around power state.
Evan Chu [Tue, 2 Oct 2012 17:28:22 +0000 (13:28 -0400)]
Fix locking around power state.

Protect state against multi-threaded access.

Bug: 7281263
Change-Id: I12735c725b6abf956cb7143f25397653839bc6e4

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 3 Oct 2012 14:00:12 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoam e897cc40: Substitute empty select for configurable AID.
Paul Chaisson [Tue, 2 Oct 2012 19:55:52 +0000 (12:55 -0700)]
am e897cc40: Substitute empty select for configurable AID.

* commit 'e897cc402e50a06ccd08b03c8942a2f17e46daef':
  Substitute empty select for configurable AID.

9 years agoSubstitute empty select for configurable AID.
Paul Chaisson [Mon, 1 Oct 2012 01:42:11 +0000 (21:42 -0400)]
Substitute empty select for configurable AID.

Workaround some SEs that do not support interpreting
an empty select as a select of the card manager.

Bug: 7198430
Change-Id: Icce0e793ca6f03d5c2271812859b04417d2708e8

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 2 Oct 2012 14:00:04 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoam 7379fb73: Merge "Fix native crash during RF field notifications." into jb-broadcom-nfc
Martijn Coenen [Mon, 1 Oct 2012 21:05:56 +0000 (14:05 -0700)]
am 7379fb73: Merge "Fix native crash during RF field notifications." into jb-broadcom-nfc

* commit '7379fb73a8e88720977604d62983706b3c4391bf':
  Fix native crash during RF field notifications.

9 years agoMerge "Fix native crash during RF field notifications." into jb-broadcom-nfc
Martijn Coenen [Mon, 1 Oct 2012 21:03:59 +0000 (14:03 -0700)]
Merge "Fix native crash during RF field notifications." into jb-broadcom-nfc

9 years agoFix native crash during RF field notifications.
Martijn Coenen [Mon, 1 Oct 2012 19:13:56 +0000 (12:13 -0700)]
Fix native crash during RF field notifications.

Bug: 7264008
Change-Id: I2647b0c6adf8f95e21d9f789c411742aef19c5ad

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 1 Oct 2012 13:59:33 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoam 43727fbb: Power up the NFCC when DH wants to talk to the SE.
Paul Chaisson [Mon, 1 Oct 2012 05:03:59 +0000 (22:03 -0700)]
am 43727fbb: Power up the NFCC when DH wants to talk to the SE.

* commit '43727fbb7cc3b799a46c3d6ddeff24dd83081449':
  Power up the NFCC when DH wants to talk to the SE.

9 years agoam a80bb9a5: Do not activate a tag during NFC disable.
Evan Chu [Mon, 1 Oct 2012 04:55:47 +0000 (21:55 -0700)]
am a80bb9a5: Do not activate a tag during NFC disable.

* commit 'a80bb9a5333d4f4f749778f3a7b13b8c7ae58c6f':
  Do not activate a tag during NFC disable.

9 years agoPower up the NFCC when DH wants to talk to the SE.
Paul Chaisson [Sun, 30 Sep 2012 13:50:36 +0000 (09:50 -0400)]
Power up the NFCC when DH wants to talk to the SE.

We need to allow usecases were the DH wants to talk to
the SE even if the screen is off.

Bug: 7257431
Change-Id: Iad66ef29757985b7aab5f0748fbf7589b3777bc3

9 years agoDo not activate a tag during NFC disable.
Evan Chu [Fri, 28 Sep 2012 16:20:35 +0000 (12:20 -0400)]
Do not activate a tag during NFC disable.

Could cause RF field to remain on.

Bug: 7164846
Change-Id: I82efc29b96c7129465fea5354fa5484da31618a6

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 30 Sep 2012 14:00:07 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoam 914d6caa: Disable all RF activity when DH connects to SE.
Martijn Coenen [Fri, 28 Sep 2012 19:38:14 +0000 (12:38 -0700)]
am 914d6caa: Disable all RF activity when DH connects to SE.

* commit '914d6caa70f544fb3dd0710de59dff090c695caa':
  Disable all RF activity when DH connects to SE.

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 27 Sep 2012 14:00:20 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoDisable all RF activity when DH connects to SE.
Martijn Coenen [Wed, 26 Sep 2012 20:09:20 +0000 (13:09 -0700)]
Disable all RF activity when DH connects to SE.

If we leave RF polling/listen enabled while talking
to the SE from the DH, there is corruption on frames
sent out over SWP. To resolve this, disable discovery
(both poll and listen) when the SE is route to the DH.

This also makes the behavior identical to that of
the PN65N devices, which don't allow any RF activity
when the SE is routed to the host.

Bug: 7004303
Change-Id: I05ad55a6f75b9f346feaf20dccefc23919ff538f

9 years agoam 18ccd96a: Enable/disable RF discovery only when needed.
Martijn Coenen [Wed, 26 Sep 2012 19:51:39 +0000 (12:51 -0700)]
am 18ccd96a: Enable/disable RF discovery only when needed.

* commit '18ccd96ac38d28864230f4f1d264fd1a4cc16d8a':
  Enable/disable RF discovery only when needed.

9 years agoam a112f9c0: Fix NFC->Bluetooth headset/a2dp connection.
Martijn Coenen [Wed, 26 Sep 2012 18:04:09 +0000 (11:04 -0700)]
am a112f9c0: Fix NFC->Bluetooth headset/a2dp connection.

* commit 'a112f9c00e3337ef38ea8e1715a99db4966c7219':
  Fix NFC->Bluetooth headset/a2dp connection.

9 years agoEnable/disable RF discovery only when needed.
Martijn Coenen [Wed, 26 Sep 2012 17:53:59 +0000 (10:53 -0700)]
Enable/disable RF discovery only when needed.

Fixes coming out of suspend with EE routing enabled.

Bug: 7233312
Change-Id: Ibbb9d7c26c2152fbac543d84d3306fc0ed50272d

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 26 Sep 2012 14:00:11 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoFix NFC->Bluetooth headset/a2dp connection.
Martijn Coenen [Wed, 26 Sep 2012 05:27:32 +0000 (22:27 -0700)]
Fix NFC->Bluetooth headset/a2dp connection.

The new BT stack has some changed behavior with respect
to getProfileProxy() - it cannot be called before BT
is enabled. Moved the proxy code into BluetoothHeadsetHandover
and deal with it there.

Bug: 7150073
Change-Id: Ia227e0f6fa5639ed68379c751104ade82c893af6

9 years agoam 2f9909a2: Tell secure element to warm-reset when closing pipe to DH.
Evan Chu [Wed, 26 Sep 2012 01:46:03 +0000 (18:46 -0700)]
am 2f9909a2: Tell secure element to warm-reset when closing pipe to DH.

* commit '2f9909a2ac0786983f3f564364053c56ef353819':
  Tell secure element to warm-reset when closing pipe to DH.

9 years agoam dc8a29da: Fix NXP PN544 controller interop with Broadcom controller
Evan Chu [Wed, 26 Sep 2012 01:46:02 +0000 (18:46 -0700)]
am dc8a29da: Fix NXP PN544 controller interop with Broadcom controller

* commit 'dc8a29dabea23ad526f767c4f6af949d626518d3':
  Fix NXP PN544 controller interop with Broadcom controller

9 years agoam 5b26e322: Don\'t try to set low-power mode if NFA_enable fails.
Evan Chu [Wed, 26 Sep 2012 01:46:01 +0000 (18:46 -0700)]
am 5b26e322: Don\'t try to set low-power mode if NFA_enable fails.

* commit '5b26e322575a1c32595ec77cde3542a88065b2be':
  Don't try to set low-power mode if NFA_enable fails.

9 years agoTell secure element to warm-reset when closing pipe to DH.
Evan Chu [Tue, 25 Sep 2012 22:45:46 +0000 (18:45 -0400)]
Tell secure element to warm-reset when closing pipe to DH.

Set HCI registry to cause Oberthur secure element to perform warm-reset.
We use this to close any applets that the DH may have opened during
communication to the SE.

This feature is Oberthur-specific.

Bug: 7163680
Change-Id: Id0589b5b41bbea1df9b8dbd73abd5a112f773916

9 years agoFix NXP PN544 controller interop with Broadcom controller
Evan Chu [Thu, 20 Sep 2012 15:33:16 +0000 (11:33 -0400)]
Fix NXP PN544 controller interop with Broadcom controller

When NDEF detection times out, stop polling temporarily.
Let NXP PN544 controller poll and activate the NFC-DEP interface.

Bug: 6986507
Change-Id: Iaa3194e4dbc4b9d2c16aaeb360a7f15dfd82c38a

9 years agoDon't try to set low-power mode if NFA_enable fails.
Evan Chu [Tue, 25 Sep 2012 03:36:46 +0000 (23:36 -0400)]
Don't try to set low-power mode if NFA_enable fails.

Would otherwise cause stack hang.

Bug: 7214014
Change-Id: I5a5373f389b06b873cee1c1fb694502d7ad598b3

9 years agoDon't hold the routing wakelock longer than a minute.
Martijn Coenen [Fri, 21 Sep 2012 03:42:52 +0000 (20:42 -0700)]
Don't hold the routing wakelock longer than a minute.

Until we figure out why routing gets stuck, don't hold
the wakelock indefinitely.

Bug: 7113095
Change-Id: If4d1ed8d8855e2b50ddae6d06e886faf0d58db6d

9 years agoMerge "Don't hold the routing wakelock longer than a minute." into jb-mr1-dev
Martijn Coenen [Fri, 21 Sep 2012 18:04:32 +0000 (11:04 -0700)]
Merge "Don't hold the routing wakelock longer than a minute." into jb-mr1-dev

9 years agoDon't hold the routing wakelock longer than a minute.
Martijn Coenen [Fri, 21 Sep 2012 03:42:52 +0000 (20:42 -0700)]
Don't hold the routing wakelock longer than a minute.

Until we figure out why routing gets stuck, don't hold
the wakelock indefinitely.

Bug: 7113095
Change-Id: If4d1ed8d8855e2b50ddae6d06e886faf0d58db6d

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 21 Sep 2012 14:00:19 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoam 46974c09: Don\'t print error for resetting SE route.
Martijn Coenen [Fri, 21 Sep 2012 03:42:47 +0000 (20:42 -0700)]
am 46974c09: Don\'t print error for resetting SE route.

* commit '46974c09ec89cea00242bb94fe8a3a356b239c18':
  Don't print error for resetting SE route.

9 years agoDon't print error for resetting SE route.
Martijn Coenen [Fri, 21 Sep 2012 02:39:50 +0000 (19:39 -0700)]
Don't print error for resetting SE route.

Bug: 7113095
Change-Id: Iaa2e2b05244ec10392c98aa5dd0d5ee84e62e39f

9 years agoam 0873b051: Grant license
Evan Chu [Thu, 20 Sep 2012 20:30:04 +0000 (13:30 -0700)]
am 0873b051: Grant license

* commit '0873b0517eb1ab968be90f66f0b3cdbbeb62f78c':
  Grant license

9 years agoam b95ef0b6: copyright by The Android Open Source Project
Evan Chu [Thu, 20 Sep 2012 19:46:43 +0000 (12:46 -0700)]
am b95ef0b6: copyright by The Android Open Source Project

* commit 'b95ef0b6e86a4fcfe2474ccaea0925f69a462bec':
  copyright by The Android Open Source Project

9 years agoGrant license
Evan Chu [Thu, 20 Sep 2012 18:39:22 +0000 (14:39 -0400)]
Grant license

Bug: 7125646
Change-Id: If700eb3cdd85e9ee08701d2dd8971ce2500a834d

9 years agocopyright by The Android Open Source Project
Evan Chu [Wed, 19 Sep 2012 22:18:30 +0000 (18:18 -0400)]
copyright by The Android Open Source Project

Bug: 7125646
Change-Id: I4de457f982857be315d65386f431d5eafcd8af02

9 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 19 Sep 2012 14:01:46 +0000 (07:01 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

9 years agoMerge "Merge NFCEE wakelocks." into jb-mr1-dev
Martijn Coenen [Wed, 19 Sep 2012 02:30:51 +0000 (19:30 -0700)]
Merge "Merge NFCEE wakelocks." into jb-mr1-dev

9 years agoam 7be608bc: Fix locking in PeerToPeer.
Martijn Coenen [Wed, 19 Sep 2012 02:20:53 +0000 (19:20 -0700)]
am 7be608bc: Fix locking in PeerToPeer.

* commit '7be608bcc4495aafcb700aa61072050fdc96f3e8':
  Fix locking in PeerToPeer.

9 years agoMerge NFCEE wakelocks.
Martijn Coenen [Wed, 19 Sep 2012 01:08:36 +0000 (18:08 -0700)]
Merge NFCEE wakelocks.

These were just in for debugging.

Bug: 6963484
Change-Id: Iac4b9185a615243783614429869f3f34b5cba82f

9 years agoFix locking in PeerToPeer.
Martijn Coenen [Tue, 18 Sep 2012 00:28:40 +0000 (17:28 -0700)]
Fix locking in PeerToPeer.

The PeerToPeer class had some serious multi-threading issues:
- mServers / mClients simultaneously being accessed by different threads
- P2pServer / P2pClient objects being deleted while still being used by
  other threads
- Race conditions where we could go to sleep on a condition variable
  without ever waking up.

This fixes most of the issues by:
- Properly locking all access to mServers / mClients
- Using Android's sp mechanism to do ref counting on P2pServer/P2pClient/NfaConn

TODO:
- Fix races around the condition variables - those are very hard to hit,
  but we need them fixed anyway.

Bug: 7089048
Change-Id: I08564c65cc40734086e517d6107e31f86c3b6adc

9 years agoam c6cf8e45: Integrate NFC Hardware Abstraction Layer.
Evan Chu [Wed, 19 Sep 2012 00:07:13 +0000 (17:07 -0700)]
am c6cf8e45: Integrate NFC Hardware Abstraction Layer.

* commit 'c6cf8e45c27d8a43d09b997cc223e8068d140edd':
  Integrate NFC Hardware Abstraction Layer.

9 years agoIntegrate NFC Hardware Abstraction Layer.
Evan Chu [Thu, 13 Sep 2012 21:43:41 +0000 (17:43 -0400)]
Integrate NFC Hardware Abstraction Layer.

Bug: 7123942
Change-Id: I4fa153b80e1af2b00b326370e102f714cde4334b