Commits · tools_r20 · halo / packages_apps_Nfc

01 May, 2012 1 commit
- Merge "NFC JNI: do not log the aid of the transaction" · 3a8948a0
  Jean-Baptiste Queru authored 13 years ago
  
  3a8948a0
02 Mar, 2012 1 commit

NFC JNI: do not log the aid of the transaction · abee6672

Chih-Wei Huang authored 13 years ago

For security reasons, the system must not log the aid of the transaction.

Log the aid only if TRACE_ENABLED=1 for debugging purpose.

Change-Id: I44b0918b534a216a56755090c9c9d83a58cda78c

abee6672

15 Feb, 2012 1 commit
- Merge "Remove a warning of mismatch arguments" · cd7cbe30
  Jean-Baptiste Queru authored 13 years ago
  
  cd7cbe30
14 Feb, 2012 1 commit

Remove a warning of mismatch arguments · f08ddeec

Chih-Wei Huang authored 13 years ago

The fix removes the warning:

packages/apps/Nfc/jni/com_android_nfc_NativeNfcManager.cpp:286: warning: too few arguments for format

Change-Id: I81c61055f675890ea2e8be5f417f83df48621cff

f08ddeec

08 Dec, 2011 2 commits
- Reconcile with ics-mr1-release · 7948ab63
  The Android Open Source Project authored 13 years ago
```
Change-Id: Iae8b0bb1f14c64adec02801d848f9157a2891999
```
  7948ab63
- merge in ics-mr1-release history after reset to ics-mr1 · 3957268e
  The Android Automerger authored 13 years ago
  
  3957268e
07 Dec, 2011 2 commits

Fix Beam&Tag failures after opening NFC-EE. · 985dcef8

Nick Pelly authored 13 years ago

An earlier MR1 checkin stopped re-registering the remote
device notification callback with libnfc on start_discovery.
This causes a regression since opening the NFC-EE will change
the callback. So Tag&Beam notifications end up going to
the secure element callback - causing crashes or missed tags.

Bug: 5725521
Change-Id: Idddba26b7babae095c124fda44e5b1da37549acd

985dcef8

merge in ics-mr1-release history after reset to ics-mr1 · 3a8843a4
The Android Automerger authored 13 years ago

3a8843a4

06 Dec, 2011 1 commit
- Import revised translations. DO NOT MERGE · 16ac4580
  Eric Fischer authored 13 years ago
```
Change-Id: I56a5d2b5904223254eecd27f875f89b135fbd11a
```
  16ac4580
02 Dec, 2011 1 commit
- merge in ics-mr1-release history after reset to ics-mr1 · 3f3cc18f
  The Android Automerger authored 13 years ago
  
  3f3cc18f
01 Dec, 2011 1 commit

Fix mismatched link()/unlink() causing NFC-EE to be stuck open. · 92250f5c

Nick Pelly authored 13 years ago

The fix is to keep a strong reference to the IBinder (actually
a BinderProxy) from the caller while the NFC-EE is open.

The bug occurs when a GC occurs in NfcService while the NFC-EE
is open. The BinderProxy is destroyed before it has been unlinked.

Bug: 5684874

92250f5c

30 Nov, 2011 1 commit
- merge in ics-mr1-release history after reset to ics-mr1 · 25e0d397
  The Android Automerger authored 13 years ago
  
  25e0d397
29 Nov, 2011 2 commits
- Restore deleted string still referenced from manifest. · 951dad2b
  Eric Fischer authored 13 years ago
```
Change-Id: I72188c26d8d1cc47f50f586bbb680bc8297bd81c
```
  951dad2b
- merge in ics-mr1-release history after reset to ics-mr1 · 1fc599b5
  The Android Automerger authored 13 years ago
  
  1fc599b5
28 Nov, 2011 3 commits

Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1 · 3a675100
Martijn Coenen authored 13 years ago

3a675100
merge in ics-mr1-release history after reset to ics-mr1 · 5eadae22
The Android Automerger authored 13 years ago

5eadae22

Fix NdefFormatable not showing up for NfcA technologies. · 841409b8

Martijn Coenen authored 13 years ago

Regression from a patch applied long ago: the NfcA technology
used to have its higher-level type (Mifare / 4A) associated with it,
and the code that determined formatable used this. The patch
associated NfcA technology only with the 3A libnfc type, causing the
format check to return false for all of these types.

Change-Id: Idc02873de447b6d8121bff02af795a6a7f5058cf

841409b8

22 Nov, 2011 2 commits
- merge in ics-mr1-release history after reset to ics-mr1 · ad628676
  The Android Automerger authored 13 years ago
  
  ad628676
- Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 · e1cadb0c
  Nick Pelly authored 13 years ago
  
  e1cadb0c
21 Nov, 2011 1 commit

Replace vendor specific NfcGoogle.apk with generic Nfc.apk · 37bb7b23

Nick Pelly authored 13 years ago

The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I4437dff96f2529f0b9e7d8e65c21359c3eeccd0b

37bb7b23

17 Nov, 2011 4 commits
- Merge "Also send NFCEE broadcasts to dynamically registered receivers." into ics-mr1 · 806a7827
  Martijn Coenen authored 13 years ago
  
  806a7827
- Also send NFCEE broadcasts to dynamically registered receivers. · 483f3065
  Martijn Coenen authored 13 years ago
```
Bug: 5630129
Change-Id: I050283b6a8be0f564b34da0f8c08c6bb708f2501
```
  483f3065
- Merge "Set up DISCOVERY and SE notification callbacks at NFC init." into ics-mr1 · 078e8368
  Nick Pelly authored 13 years ago
  
  078e8368
- merge in ics-mr1-release history after reset to ics-mr1 · 23136ec8
  The Android Automerger authored 13 years ago
  
  23136ec8
16 Nov, 2011 8 commits
- Set up DISCOVERY and SE notification callbacks at NFC init. · 4d80c353
  Nick Pelly authored 13 years ago
```
Previously we only set these up on startDiscovery, so we could
not receive SE events at the lock screen on first boot.

Bug: 5375005
Change-Id: I0ed75cd8ea52ea956708b4fa807c1fd91e4f78b6
```
  4d80c353
- Merge "Import revised translations. DO NOT MERGE" into ics-mr1 · bc6535cc
  Eric Fischer authored 13 years ago
  
  bc6535cc
- Import revised translations. DO NOT MERGE · e6178c23
  Eric Fischer authored 13 years ago
```
Change-Id: I5f2eb5d7a5862bd8dfd2a3fc3b21f6c48138b8bf
```
  e6178c23
- No-op merge from ics-mr0 · 59137f77
  The Android Open Source Project authored 13 years ago
```
Change-Id: Ib08eefd86bf225653dd51e00e3be51cb184f24bd
```
  59137f77
- Reconcile with ics-factoryrom-2-release · 5c12d70c
  The Android Open Source Project authored 13 years ago
```
Change-Id: Id092aea61ede38a6e5018b4e66586ca3025528fa
```
  5c12d70c
- merge in ics-mr1-release history after reset to ics-mr1 · 2a7163a3
  The Android Automerger authored 13 years ago
  
  2a7163a3
- Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1 · 2b093e93
  Nick Pelly authored 13 years ago
  
  2b093e93
- Enable NFC-EE immediately when screen is on but locked. · fc87b429
  mike wakerly authored 13 years ago
```
Bug: 5375005
Change-Id: I072dfbca1fa8cdd25cf9232f2f0c82080aec767b
```
  fc87b429
15 Nov, 2011 2 commits
- merge in ics-mr1-release history after reset to ics-mr1 · 905cf88c
  The Android Automerger authored 13 years ago
  
  905cf88c
- Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1 · f4226b69
  Nick Pelly authored 13 years ago
  
  f4226b69
14 Nov, 2011 1 commit

Add null check to aovid NPE on un-matched close(). · 0571ce53

Nick Pelly authored 13 years ago

Also finish removing NFCEE permission, and fix a couple of style mistakes.

Change-Id: I4ec22469990de6661365c281db2e8cfd7ae413b0

0571ce53

13 Nov, 2011 1 commit
- merge in ics-mr1-release history after reset to ics-mr1 · 68dfe2cb
  The Android Automerger authored 13 years ago
  
  68dfe2cb
11 Nov, 2011 3 commits

Merge "Implement static white-list access control for NFC-EE." into ics-mr1 · ebf4b36e
Nick Pelly authored 13 years ago

ebf4b36e

Optimize soundpool use. · d9203771

Martijn Coenen authored 13 years ago

Share a single soundpool and release it when NFC is disabled.

Bug: 5590478
Change-Id: I858c9520bf6880e7d7c5920c12966d86108dd125

d9203771

Implement static white-list access control for NFC-EE. · c05387ef

Jeff Hamilton authored 13 years ago

NFC service now has a build time array of package signatures and package names
that are allowed access to the NFCEE, removing the shared certificate
requirement.

See sample_nfcee_access.xml for the XML format.

Bug: 4515759
Change-Id: Ibf03e259137f2f4247ec5d31fb88b1090b013d32

c05387ef

09 Nov, 2011 1 commit
- am 88194cf3: (-s ours) Import revised translations. DO NOT MERGE · 133d5fee
  Eric Fischer authored 13 years ago
```
* commit '88194cf3':
  Import revised translations.  DO NOT MERGE
```
  133d5fee