| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
https://android.googlesource.com/platform/packages/apps/Nfc into 1.1
Android 4.2.2 release 1
|
| |
| |
| |
| | |
Change-Id: I391d8e1be1a61e68b01f0db371dbb4ed3e5b5933
|
| |
| |
| |
| | |
Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
https://android.googlesource.com/platform/packages/apps/Nfc into HEAD
Conflicts:
nxp/jni/com_android_nfc_NativeNfcManager.cpp
Change-Id: Ic84af6ad1cda79984f40e9fc464d2cbaa994b89a
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
On sw600 and larger, the navbar is at the bottom,
not to the side.
Bug: 7399926
Change-Id: I825a1156995ec6e84faef16866dea4bf240a11c2
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
* commit 'a949c74321b17f8ef1c93692064969f60815c7e4':
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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- 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
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
jb-broadcom-nfc
* commit '7bb9229c66e38ce9e3fbb8c5364ca3416e19c5bc':
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
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 7276355
Change-Id: If2732afd542a68dc440308dae9eb76eb7ff31e25
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
* commit 'a112f9c00e3337ef38ea8e1715a99db4966c7219':
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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Until we figure out why routing gets stuck, don't hold
the wakelock indefinitely.
Bug: 7113095
Change-Id: If4d1ed8d8855e2b50ddae6d06e886faf0d58db6d
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
These were just in for debugging.
Bug: 6963484
Change-Id: Iac4b9185a615243783614429869f3f34b5cba82f
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The previous CL that set FLAG_ACTIVITY_NEW_TASK flag in pendingIntent did not fix the bug. The flag needs to be set in the view intent.
Bug: 6925612
Change-Id: Ibe5892c575fdf904c800c726122c59be6af02685
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
To avoid encouraging sloppy filtering. This was
actually already the behavior pre-JB.
Change-Id: I556f250db086b70345123a151378728080b4779c
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
* commit 'db216e63dad45973ff4992098229208a518d658f':
Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 6925612
Change-Id: I37f49a150c4fc1763b2121e46fedf79d662b0a2b
|
| |/ /
| | |
| | |
| | | |
Change-Id: I4d40a33bf11379845464f4072471c168f9dccf75
|
| | |
| | |
| | |
| | |
| | |
| | | |
Original patch from Chih-Weih Huang <cw_huang@htc.com>.
Change-Id: I15b129d318d125cf67aba83d16441c6d52bb193a
|
| | |
| | |
| | |
| | |
| | | |
Bug: 6629750
Change-Id: Idee36983952b4ba593464f72188c6fb702c59f7f
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The new NCI stack can deal with larger MIU and
rw sizes, which give us better p2p throughput.
Change-Id: I6600f28ddafe142b64ead2df896823bb8d242fc5
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
* commit 'bb65a8d87ee523c92ca1b5f57efe139bab3859fe':
Allow NfcB connects in NCI stack.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
PN544 did not support this - move the code checking for that
into dh implementation.
Change-Id: I4def57697bc81cf599421f1ffbfa85c0db72c458
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Exposed by the new stack; need to take locks around
mRunning and mLlcpServerSocket.
Bug: 6922853
Change-Id: Ic8e3b90d1a1c9d77b27308e3f18bf8871843206f
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
From partner drop at 07/20. Modified to fit into our new
JNI/DH split.
New build config that builds two targets,
Nfc and NfcNci, each with their own dependencies. Product config files
have to specify either Nfc or NfcNci in their packages config.
Change-Id: I348a3aad7167195ca03baf9636408ab8e4c55fce
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 6759842
Change-Id: I6d1e24472702007616c0be71aacda9e591a23620
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The Connection Handover specification dictates that we should
exchange Hr/Hs records over a dedicated LLCP service. This adds
the service, and starts using it by default. It will fall back
to the SNEP GET method to remain compatible with Android 4.1
devices. SNEP GET on these devices will return "Not Implemented",
also per the SNEP spec.
Also fixed a bug in endianness of the OOB record.
Bug: 6759842
Change-Id: Ifd360f556bf0e1757eb8bbaadf11efa094aefcf6
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Preparation for the new NCI stack. The idea is to
build either the NXP or the NCI stack, triggered
by a makefile switch. To that end, move the
DeviceHost and JNI implementations in their own
directory, so we can build them only if needed.
Change-Id: I8579ec30ceb1908e4cd180cfbd10224aa4bddb8d
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
NOT MERGE)
This reverts commit 26f6049196acaa9768ba6bdef343216ea878a4c1.
Change-Id: I7ed3a1ba24bbbdb3336547c20f47c344d70b2d30
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Preparation for the new NCI stack. The idea is to
build either the NXP or the NCI stack, triggered
by a makefile switch. To that end, move the
DeviceHost and JNI implementations in their own
directory, so we can build them only if needed.
Change-Id: Ibb6aeb11f0bb887e153fd457860b1ad0e39e7933
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Exposed by the new stack; need to take locks around
mRunning and mLlcpServerSocket.
Bug: 6922853
Change-Id: Ic8e3b90d1a1c9d77b27308e3f18bf8871843206f
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
From partner drop at 07/20. Modified to fit into our new
JNI/DH split.
New build config that builds two targets,
Nfc and NfcNci, each with their own dependencies. Product config files
have to specify either Nfc or NfcNci in their packages config.
Change-Id: I348a3aad7167195ca03baf9636408ab8e4c55fce
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Preparation for the new NCI stack. The idea is to
build either the NXP or the NCI stack, triggered
by a makefile switch. To that end, move the
DeviceHost and JNI implementations in their own
directory, so we can build them only if needed.
Change-Id: I8579ec30ceb1908e4cd180cfbd10224aa4bddb8d
|
| | |
| | |
| | |
| | | |
This reverts commit 26f6049196acaa9768ba6bdef343216ea878a4c1.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Preparation for the new NCI stack. The idea is to
build either the NXP or the NCI stack, triggered
by a makefile switch. To that end, move the
DeviceHost and JNI implementations in their own
directory, so we can build them only if needed.
Change-Id: Ibb6aeb11f0bb887e153fd457860b1ad0e39e7933
|
| | |
| | |
| | |
| | |
| | | |
Bug: 6759842
Change-Id: I0fe1e6859d8792b959a1306404bd239ab33dd3b4
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The Connection Handover specification dictates that we should
exchange Hr/Hs records over a dedicated LLCP service. This adds
the service, and starts using it by default. It will fall back
to the SNEP GET method to remain compatible with Android 4.1
devices. SNEP GET on these devices will return "Not Implemented",
also per the SNEP spec.
Also fixed a bug in endianness of the OOB record.
Bug: 6759842
Change-Id: Iafe67ab119e933df5dfa0a5645a95bc59badd8ae
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
jb-dev
* commit 'fef4b82cb6f95a9a7dbb510e31d6316883857c26':
Don't assume Bluetooth is present.
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
* commit 'd560e24e8edf8251a3756400ce5f75bcfdd51b9a':
Add watchdog to applyRouting().
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '62a8997361a059183f2547365a6055db3d45e9c9':
Use new handover intent actions.
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
fails." into jb-dev
* commit 'abf67e1baa0a4b313d9338e69261db47c33725be':
Fall back to NDEF push if handover SNEP get fails.
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '7d44aa52f36e8b0a08fcbb7fdf3af207cd54a97b':
Show time in NFC handover notifications.
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'beb7b1b4b95b1762b507eb2a9c6380e24c8b7a62':
Bluetooth Beam: generate unique filenames.
|