Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,942 Commits 3 Branches 0 Tags
481f22ecda189554b31a8967c3c42a0877458d61
Commit Graph

270 Commits

Author SHA1 Message Date
Martijn Coenen
e386f7f510 Merge "Expose peer LLCP version in NDEF callbacks." 2015-04-17 07:02:59 +00:00
Martijn Coenen
fd70bb1367 Expose peer LLCP version in NDEF callbacks. 
Change-Id: I98b9a9764b66345f842c1f845c8a386161d965f5
 2015-04-15 12:33:37 +02:00
Martijn Coenen
ed3a29ea08 Add getPrefixAids(). 
Bug: 19144664
Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3
 2015-04-15 09:48:57 +02:00
Narayan Kamath
0699722a13 am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774" 
* commit '3d6cfe0eb1c9fcfabaf7b02548dd6d5cc16203d6':
  fix issuse 65774
 2015-01-02 10:34:03 +00:00
Paul Quei
65e37ee936 fix issuse 65774 
"Some vendors have there own well defined specifications ...". Should be "Some vendors have their own well defined specifications ..."

Change-Id: I0d770ac0591812c1c61389eb0078493098784323
Signed-off-by: Paul Quei <paulquei@gmail.com>
 2015-01-02 10:21:55 +00:00
Martijn Coenen
2bf6529bf8 Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 2014-11-20 17:59:24 +00:00
Martijn Coenen
d8bcfbadf7 Verify NFC permission immediately on API calls. 
Bug: 18358968
Change-Id: I648494e6435e107337e0c5bc4c6328774f9a54be
 2014-11-14 10:51:14 -08:00
Andres Morales
56f299b87a Add UserHandle to BeamShareData 
Allows NfcService to start the beam transfer
process in the correct user.

Bug:17966846
Change-Id: Ie98c98e763f0c2eabf11afda645c421b0332a2f6
 2014-11-03 11:44:10 -08:00
Andres Morales
258d222152 Fix build, previous commit failed to remove an import 
Bug:17883273
Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
 2014-10-07 11:15:58 -07:00
Andres Morales
052690540e Remove dead NFC unlock code from fw/base 
Bug:17883273
Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
 2014-10-06 16:04:19 -07:00
Martijn Coenen
0a094c61bc Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 2014-09-26 18:08:31 +00:00
Martijn Coenen
56a3e67433 Add hidden API to disable NFC (optional persist). 
Bug: 17298769
Change-Id: I1fa59592a34f1207731dc75d2e548b3e614d94f5
 2014-09-25 18:02:27 -07:00
Martijn Coenen
5e991a129c Upper-case incoming AIDs. 
This fixes scenarios where different services
register the same AID in a different case, and
we don't see any conflict.

Bug: 16517161
Change-Id: I610b585ce7d57b4e32c21004a1d4c50e1133986a
 2014-09-16 16:06:45 -07:00
Martijn Coenen
9ed2d5f746 Merge "Fix static AID prefix registration." into lmp-dev 2014-09-16 17:40:30 +00:00
Martijn Coenen
0985fb6c42 Fix static AID prefix registration. 
Bug: 16517161
Change-Id: Ibaddf8720907f1d28d44231d927f538628bbf9d0
 2014-09-16 10:09:12 -07:00
Martijn Coenen
7e25a504d4 Merge "AID prefix registration." into lmp-dev 2014-09-16 14:55:04 +00:00
Andres Morales
9c4f400aac Add hidden API for pausing and resuming NFC polling. 
Bug:17401266
Change-Id: Icce34787fc89dc33445f6c36f40f669a8b9b2f92
 2014-09-11 16:43:17 -07:00
Martijn Coenen
826a73b83b AID prefix registration. 
Bug: 16517161
Change-Id: I4e008b84fd1372b17a98437ec8a6b71c33d7cd05
 2014-09-08 23:49:07 -07:00
Andres Morales
b59d35c16d Remove old NFC unlock api 
Bug: 16401635
Change-Id: I667d91c2346355ed0a2115644e6192f5f208e288
 2014-08-19 13:13:10 -07:00
Andres Morales
f9a97942e1 Fix issue where unlock handlers are not properly updated 
If an unlock handler already exists, we need to try
to update the tech mask for it. Don't permit unlock
handlers with no tech mask.

Bug: 17054331
Change-Id: I54a885d28bdd8ce41d8646d968621c7d6abc9387
 2014-08-15 17:08:24 +00:00
Andres Morales
11d2e53dc0 NFC Unlock api changes 
Bug: 16401635
Change-Id: I994bd80be40052c2f894199bb44ebbde40077f27
 2014-07-31 01:09:02 +00:00
Andres Morales
92b4b3c64d Revert "NFC Unlock api changes" 
This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335.

Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3
 2014-07-30 21:30:50 +00:00
Andres Morales
131197aa6e NFC Unlock api changes 
Bug: 16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
 2014-07-30 21:17:06 +00:00
Martijn Coenen
29c2e3797a Make some NFC APIs @systemAPI. 
Change-Id: I12e292563a517211e4fae7a1f64021758f396d1a
 2014-07-30 21:03:07 +00:00
Martijn Coenen
d92c168974 Add API to query for AID prefix support. 
For future devices which may support
registering AID prefixes. Get the API in for now,
the actual implementation is pretty simple and
will follow later.

Change-Id: I6c16dae9a4dbc0f9cd84bdb61a4de93cffd278ec
 2014-07-02 16:30:06 -07:00
Martijn Coenen
b92dc6b013 Clean up dynamic AID XML parser. 
<aid-group> should be generated and parsed
in its own object.

Change-Id: I70f4511a682c66f8d11b7797a0f171cda24cc617
 2014-07-02 14:11:54 -07:00
Martijn Coenen
b51441163f Move AID validation to CardEmulation. 
More logical place since it's a generic utility
function.

Change-Id: I3381f10d6720e415d091dbd475ef0df8733e7e75
 2014-07-02 12:44:33 -07:00
Martijn Coenen
dbedb4cc0f Add new IPC for direct Beam invoke. 
Used by BeamShareActivity when Beam is invoked
through the share menu. Also made these IPCs
one-way as they can run asynchronously.

Bug: 15939863
Change-Id: I7d048947c96c697e6b04bbda2ec3fbf28cccc29b
 2014-07-01 23:01:04 +00:00
Martijn Coenen
1bfc3d6249 Validate AIDs when registered. 
Change-Id: Ib7140c30a8a7587f1809f529d3303e69933bb245
 2014-07-01 17:37:59 +00:00
Andres Morales
d8cf53f87d Make unlock api take String instead of int codes 
int code method not exposed to third parties

Change-Id: I18ad0703be9d06664db3fd00a6435f789979fe73
 2014-06-20 16:13:16 -07:00
Andres Morales
3b33fd283c Framework changes to support NFC trustlet. 
Adds a system-only ability to register for receiving
tags from NfcService at the lockscreen.

Change-Id: I4b50941031e8d1f40ebb6314211226e70a2ad187
 2014-06-20 10:05:52 -07:00
Martijn Coenen
df48db3c7c Address HCE API review comments. 
Remove AidGroup from public APIs.

Bug: 15089341
Change-Id: Ia8e038a12891abc6f1a8e82dbf30b8952e0b1fd7
 2014-05-29 21:10:01 +00:00
Andres Morales
62b25a5bf0 Revert "Adding INfcUnlockSettings and NfcUnlock interface class." 
This will be re-added as a Trustlet in a subsequent CL.

This reverts commit 38a7ed05f8.

Change-Id: I5aa36df42a7751f165b4ef184e0cda57e5568b59
 2014-05-20 16:59:34 +00:00
Martijn Coenen
2f6f3a0181 HCE/SE foreground support. 
Allow apps to tell the OS they prefer a specific
CardEmulation service to handle a transaction
whenever they are in the foreground.

Change-Id: I8489ba6018f62164ed7e3504f31c8d09accf494e
 2014-05-06 14:49:57 -07:00
Martijn Coenen
aa1492d1d8 Dynamic AID registration APIs for HCE. 
Adds a set of APIs that allows applications
to dynamically register and unregister AID groups
for HCE and Secure Element based services.

Change-Id: I08e9423dff405955cb725c87423c953a7dbe5c72
 2014-04-23 20:21:32 +00:00
Martijn Coenen
ae2a35baf4 am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field." 
* commit '4d328a79bdee417c1248660b1c33b5cd86dbd814':
  NFC: getNdefMessage() should throw exception if no tag in field.
 2014-03-06 16:21:46 +00:00
John Spurlock
a77cf87354 Merge "Tabs -> spaces in frameworks/base." 2014-02-25 19:57:33 +00:00
Martijn Coenen
6924c4ef8d Fix NFC docs breakage. 
Change-Id: I680dc7974316c77cb1835b5a81f30e6961ba3c49
 2014-02-25 11:51:11 -08:00
John Spurlock
8a985d24ce Tabs -> spaces in frameworks/base. 
Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
 2014-02-25 09:49:29 -05:00
Martijn Coenen
7fe9fa163c Add an API to manually invoke Android Beam. 
Activities can call NfcAdapter.invokeBeam() to
manually invoke the Beam animation. Any NFC tap
is then enough to complete the transaction.

Also, added NdefRecord convenience method for
creating Text records.

Bug: 5134061
Change-Id: Ia9df360d1d7e8451157c85a6d12f2a4eec924960
 2014-02-14 10:58:30 -08:00
Mathias Jeppsson
266e0a3871 NFC: getNdefMessage() should throw exception if no tag in field. 
According to documentation, an TagLostException should be thrown, if
the tag has been moved out of field when reading NDEF message.

Change-Id: Ib7e485ed442027fdebd5bc7a46101fbca0c88bdb
 2014-01-28 15:20:30 +01:00
Andres Morales
3e4b665bc6 Adding accessor for integer tech codes to Tag 
Change-Id: I02c272acc9744756677afa8a9d1dca7f1e63ca50
 2013-12-16 10:46:36 -08:00
Andres Morales
38a7ed05f8 Adding INfcUnlockSettings and NfcUnlock interface class. 
Change-Id: Ie55a5d4bb58c2944952fc84cce32d3573a3a1a22
 2013-12-09 14:41:01 -08:00
John Spurlock
6090995951 Remove unused imports from frameworks/base. 
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
 2013-11-20 11:31:47 -05:00
Martijn Coenen
f180f30b0d Add "urn:nfc" shortener. 
As defined in the NFC Forum specification
"URI Record Type Definition". For some reason
0x23 wasn't added in the past, but it's present
in the specification.

Change-Id: If4ec2216fd53a31943f6de62aa1c69166f597616
 2013-11-14 13:40:07 -08:00
Scott Main
b38ad76a82 additional javadoc for NfcAdapter.ReaderCallback 
Change-Id: I3cad8b43d53992bb3d53920abb510456ee72afb5
 2013-10-17 11:57:06 -07:00
Martijn Coenen
35bf628852 NFC card emulation API docs. 
Bug: 10550319
Change-Id: I3023639d728aa76af89d15e0491b86c7c641648e
 2013-10-14 20:58:53 +02:00
Martijn Coenen
eed43391c6 Fix crash in ApduServiceInfo parsing. 
Bug: 10949100
Change-Id: I181734074b071179ea5637a070714643508bc64b
 2013-09-26 11:20:37 -07:00
Martijn Coenen
807fd04435 Merge "Validate AID format and length." into klp-dev 2013-09-18 17:56:03 +00:00
Martijn Coenen
fca3578773 Validate AID format and length. 
Bug: 10817001
Change-Id: I7cb0d4f718c467d2fccb30068f383f8e71a4a39b
 2013-09-18 17:26:18 +02:00