summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Fix bad merge from gingerbread:Jeff Hamilton2011-05-242-0/+0
| | | | | | Show an icon in the status bar when the NfcAdapter is in card emulation mode. Change-Id: I64805f1b5f9d4bd9784791ed3a67d76b9e3788f3
* am 93d8a69c: Add com.android.nfc.permission.NFCEE_ADMIN.Jeff Hamilton2011-03-301-0/+5
|\ | | | | | | | | * commit '93d8a69ccadfa01b0a5ec3d7edeb921a1da4bce8': Add com.android.nfc.permission.NFCEE_ADMIN.
| * Add com.android.nfc.permission.NFCEE_ADMIN.Jeff Hamilton2011-03-251-0/+5
| | | | | | | | | | | | | | | | | | | | It controls permissions for NFCEE administration and is checked based on the signature of Nfc.apk and the caller. The NFCEE admin permission checking is currently set to check the stock NFC permission. Change-Id: I164511d8f6850034ca0fc1f6f7f75c5ef212fbc2
| * DO NOT MERGE - Updating Nfc assets -- should rename actual assets at some ↵Justin Ho2010-10-284-0/+0
| | | | | | | | | | | | point... Change-Id: I437bbe42eb3f17bd8bbc6e0ca111f6c7557a85d7
* | Removed unused assets.Gilles Debunne2010-11-168-0/+0
|/ | | | Change-Id: I95a11aaabd4e1c03462bc1fbba8bc22af8dde965
* Show an icon in the status bar when the NfcAdapter is in card emulation mode.Jeff Hamilton2010-10-252-0/+0
| | | | Change-Id: Ia54094291726fa4fac152a49b1b182d73ff9958f
* Enable NFC service as an application service.Nick Pelly2010-10-151-0/+1
| | | | | | | | | | | | | Uses ServiceManager.addService() to register the service. Uses BOOT_COMPLETE to start the service. Uses sharedUserId com.android.nfc so that it has a fixed uid. Uses android:persistant so that the process is not killed. Change-Id: If4264baf5dc457ee0a3ad5788c5945e84173b1ea Signed-off-by: Nick Pelly <npelly@google.com>
* NFC application.Nick Pelly2010-10-149-0/+4
NFC application contains the NFC service code that implements NFC API and talks to NFC hardware. This is the first cut at moving NFC service code out of frameworks/base into application service. Android.mk are renamed to Android.mk.hide at this commit because it does not work yet. Signed-off-by: Nick Pelly <npelly@google.com>