summaryrefslogtreecommitdiff
path: root/core/java/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* Update preferred payment related APIsJack Yu2020-03-162-12/+31
* Core proto definition for "dumpsys nfc --proto"Mike Ma2020-02-175-0/+100
* Throw IOException on multiple connects.George Chang2020-01-212-6/+9
* Use new UnsupportedAppUsage annotation.Artur Satayev2020-01-138-15/+14
* Provide APIs to get preferred payment service informationJack Yu2019-12-123-2/+130
* Merge "Fix backward compatibility when there's no secureElementName"Akinobu Nakashima2019-08-271-3/+3
|\
| * Fix backward compatibility when there's no secureElementNameAkinobu Nakashima2019-08-061-3/+3
| * Update Secure NFC API definitionsRuchi Kandoi2019-06-121-5/+6
| * Update Multi-OffHost related API definitionJack Yu2019-04-163-7/+33
* | Update Multi-OffHost related API definitionJack Yu2019-04-163-7/+33
* | Add statically built regex pattern to avoid rebuilding all the timeIoannis Ilkos2019-04-021-1/+3
* | Merge "Update Android Beam deprecated API description" am: 527b6de018 am: 8b8...Jack Yu2019-03-271-10/+20
|\|
| * Update Android Beam deprecated API descriptionJack Yu2019-03-251-10/+20
* | Merge "Add @NonNull annotations to (un)setOffHostForService()" am: 78366e46b2...Ruchi Kandoi2019-03-081-2/+4
|\|
| * Merge "Add @NonNull annotations to (un)setOffHostForService()"Treehugger Robot2019-03-071-2/+4
| |\
| | * Add @NonNull annotations to (un)setOffHostForService()Ruchi Kandoi2019-03-041-2/+4
| * | Add @UnsupportedAppUsage annotationsAndrei Onea2019-02-281-0/+7
| |/
| * DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) intoXin Li2019-02-142-2/+2
| |\
* | \ Merge "Update Secure NFC API definitions"Ruchi Kandoi2019-03-071-5/+6
|\ \ \
| * | | Update Secure NFC API definitionsRuchi Kandoi2019-03-051-5/+6
* | | | All Parcelable CREATOR fields are @NonNull.Jeff Sharkey2019-02-2810-10/+10
* | | | Add @UnsupportedAppUsage annotationsAndrei Onea2019-02-271-0/+7
|/ / /
* | | Merge "Add Secure NFC functionality" am: 3ffdb26aa8 am: c538141c6dRuchi Kandoi2019-01-282-0/+61
|\ \ \
| * | | Merge "Add Secure NFC functionality" am: 3ffdb26aa8Ruchi Kandoi2019-01-282-0/+61
| |\| |
| | * | Add Secure NFC functionalityRuchi Kandoi2019-01-232-0/+61
* | | | Merge "Deprecate Android beam APIs and create a feature flag to gate them" am...Ruchi Kandoi2019-01-041-1/+71
|\| | |
| * | | Merge "Deprecate Android beam APIs and create a feature flag to gate them" am...Ruchi Kandoi2019-01-041-1/+71
| |\| |
| | * | Deprecate Android beam APIs and create a feature flag to gate themRuchi Kandoi2019-01-041-1/+71
* | | | Merge changes from topic "multi-se-support" am: 54502d68ea am: 9c0ec9be9fRuchi Kandoi2019-01-044-9/+198
|\| | |
| * | | Merge changes from topic "multi-se-support" am: 54502d68eaRuchi Kandoi2019-01-044-9/+198
| |\| |
| | * | Add a mechanism to register AIDs to specific off-host SERuchi Kandoi2019-01-043-9/+166
| | * | Add Off-Host Card Emulation FeaturesRuchi Kandoi2019-01-031-0/+32
| * | | Merge "Move some members to the "Q blacklist"." am: f5cf9f24edNathan Harold2018-10-241-1/+2
| |\| |
| | * | Move some members to the "Q blacklist".Mathew Inwood2018-10-221-1/+2
* | | | Merge "docs: bug 37128155, broken link" into pi-dev am: 415e35525fkopriva2018-10-081-1/+1
|\| | |
| * | | Merge "docs: bug 37128155, broken link" into pi-devkopriva2018-10-081-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | docs: bug 37128155, broken linkkopriva2018-10-041-1/+1
* | | | Merge "docs: fixed five typos" into pi-dev am: 82b413428ekopriva2018-09-181-1/+1
|\| | |
| * | | Merge "docs: fixed five typos" into pi-devkopriva2018-09-181-1/+1
| |\| | | | |/ | |/|
| | * docs: fixed five typoskopriva2018-09-171-1/+1
| | * NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAMERuchi Kandoi2018-03-151-1/+1
| * | resolve merge conflicts of 92b78539e3a177b6f1912474f672db29a211e604 to stage-...Mathew Inwood2018-08-038-0/+46
| |\ \
| | * | Add @UnsupportedAppUsage annotationsMathew Inwood2018-07-318-0/+46
* | | | Move some members to the "Q blacklist".Mathew Inwood2018-09-141-1/+2
* | | | Add @UnsupportedAppUsage annotationsMathew Inwood2018-07-318-0/+46
* | | | Fix broken links in @see tags in framework docs.Aurimas Liutikas2018-06-041-2/+2
* | | | Fix broken links in @see tags in framework docs.Aurimas Liutikas2018-06-011-4/+4
|/ / /
* | / Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" am: ...Ruchi Kandoi2018-03-161-1/+1
|\| | | |/ |/|
| * NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAMERuchi Kandoi2018-03-151-1/+1
* | Merge "Add NFC Transaction Event intent actions and extras" am: 337e2feada am...Ruchi Kandoi2018-02-041-0/+30
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 17:37:44 +0000