summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
Commit message (Collapse)AuthorAgeFilesLines
* frameworks/base: Support for third party NFC featuresPuneet Mishra2016-05-234-6/+29
| | | | | | | | | | | | | | | | Integration of below modifications are necessary to support third party NFC software: * a new interface in INfcAdapter.aidl allowing vendor specific extensions and features * a new size for MIFARE Classic tags * a modified constructor to distinguish MIFARE Classic tags from NfcA tags * allowing extensions to AidGroup and changing the protection of the instance variables to package protected Change-Id: Ic11dc68c4ea83262c705ec50b75b5808aa064f82 (integrated from commit 57a001b7851c97d41f042dda643f9a87aa6306e5)
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-111-30/+34
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * Clear calling identify b4 Beam callback.Martijn Coenen2015-12-211-30/+34
| | | | | | | | | | | | | | | | Fixes AppOps crash, because it notices the calling package is different from the calling UID. Bug: 25492633 Change-Id: I55e2d975fd0a7ee94c4623efb3b19b1b54b72da2
* | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-053-0/+48
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: cmds/bootanimation/BootAnimation.cpp core/java/android/accounts/AccountManager.java core/java/android/app/AppOpsManager.java core/java/android/os/PowerManagerInternal.java core/java/android/os/storage/IMountService.java core/java/android/provider/Settings.java core/java/com/android/internal/widget/ILockSettings.aidl core/res/res/values-mcc204-mnc12/config.xml core/res/res/values-mcc219-mnc02/config.xml core/res/res/values-mcc730-mnc07/config.xml core/res/res/values/config.xml core/res/res/values/symbols.xml packages/SystemUI/res/values/config.xml packages/SystemUI/src/com/android/systemui/doze/DozeService.java packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java services/core/java/com/android/server/LocationManagerService.java services/core/java/com/android/server/am/ActivityManagerService.java services/core/java/com/android/server/pm/PackageManagerService.java services/core/java/com/android/server/power/PowerManagerService.java telecomm/java/android/telecom/Phone.java telephony/java/android/telephony/CarrierConfigManager.java telephony/java/android/telephony/RadioAccessFamily.java telephony/java/android/telephony/ServiceState.java telephony/java/android/telephony/SignalStrength.java telephony/java/android/telephony/TelephonyManager.java telephony/java/com/android/ims/ImsCallProfile.java telephony/java/com/android/ims/ImsReasonInfo.java telephony/java/com/android/ims/ImsSuppServiceNotification.aidl telephony/java/com/android/ims/ImsSuppServiceNotification.java telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl telephony/java/com/android/internal/telephony/RILConstants.java Change-Id: I99c6edb8e25a77145b5adef97d0d55bfbe676959
| * Fix missing copyright headers.Martijn Coenen2015-09-073-0/+48
| | | | | | | | | | Bug: 23868522 Change-Id: I37fb86e3a751fad363d70687d1b9bcd512bcd33e
* | NFC: Allow extensions to ApduServiceInfoPuneet Mishra2015-10-061-10/+10
|/ | | | | | | | | | | Mobile network operators expect additional features in ApduServiceInfo to support their payment solutions. To achieve this, the final keyword is removed from the class definition and its instance variables, thereby allowing extensions to the class. Change-Id: I9058d08e729027b04ee94405c66ff9d99c0f963b
* Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-devNicolas Prevot2015-07-021-1/+1
|\
| * In NfcActivityManager, don't use UserHandle.CURRENT.Nicolas Prevot2015-07-011-1/+1
| | | | | | | | | | | | | | | | | | In the work profile, UserHandle.CURRENT refers to the primary user. We want to refer to the work profile itself. So, using new UserHandle(UserHandle.myUserId()) instead. BUG:21960385 Change-Id: I4d880ccf6926e437d674874295029b29278f3e12
* | am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code ↵Robert Schaub2015-07-011-1/+1
|\ \ | |/ |/| | | | | | | | | comment to repair 404" into mnc-preview-docs * commit 'e51d6d05e9334fce5d46909ea669027762c4c0a2': docs: Changed link in Java source code comment to repair 404
| * am fae35eed: Merge "docs: Changed link in Java source code comment to repair ↵Robert Schaub2015-06-301-1/+1
| |\ | | | | | | | | | | | | | | | | | | 404" into mnc-preview-docs * commit 'fae35eed99d6bc87f3a864bdd16d951136a16cc7': docs: Changed link in Java source code comment to repair 404
| | * docs: Changed link in Java source code comment to repair 404Robert Schaub2015-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Need to find out what developer is in charge of CardEmulation.java to include in review. Bug: 19950839 Change-Id: Ic30ebaf69e46a70a64c8a123b0f72abaff7d0b80
* | | Merge "Make peer LLCP version an int." into mnc-devMartijn Coenen2015-06-101-4/+9
|\ \ \
| * | | Make peer LLCP version an int.Martijn Coenen2015-06-101-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And split major/minor. Bug: 21343778 Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
* | | | Remove NFC CardEmulation dynamic resource APIs.Martijn Coenen2015-06-052-48/+2
|/ / / | | | | | | | | | | | | | | | | | | No longer needed. Bug: 21343778 Change-Id: I5188c4bc819146861d346f3f4339f002b7173027
* | | Add NFC APIs for dynamic resources.Martijn Coenen2015-04-222-2/+77
|/ / | | | | | | | | | | For new Tap & Pay settings UX. Change-Id: I55ff4e4d4a4b6d26c3c88d96431c4f14d0963323
* | Merge "Expose peer LLCP version in NDEF callbacks."Martijn Coenen2015-04-173-11/+17
|\ \ | |/ |/|
| * Expose peer LLCP version in NDEF callbacks.Martijn Coenen2015-04-153-11/+17
| | | | | | | | Change-Id: I98b9a9764b66345f842c1f845c8a386161d965f5
* | Add getPrefixAids().Martijn Coenen2015-04-151-1/+14
|/ | | | | Bug: 19144664 Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3
* am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"Narayan Kamath2015-01-021-1/+1
|\ | | | | | | | | * commit '3d6cfe0eb1c9fcfabaf7b02548dd6d5cc16203d6': fix issuse 65774
| * fix issuse 65774Paul Quei2015-01-021-1/+1
| | | | | | | | | | | | | | "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>
* | Merge "Verify NFC permission immediately on API calls." into lmp-mr1-devMartijn Coenen2014-11-202-0/+30
|\ \
| * | Verify NFC permission immediately on API calls.Martijn Coenen2014-11-142-0/+30
| |/ | | | | | | | | Bug: 18358968 Change-Id: I648494e6435e107337e0c5bc4c6328774f9a54be
* | Add UserHandle to BeamShareDataAndres Morales2014-11-032-5/+17
|/ | | | | | | | Allows NfcService to start the beam transfer process in the correct user. Bug:17966846 Change-Id: Ie98c98e763f0c2eabf11afda645c421b0332a2f6
* Fix build, previous commit failed to remove an importAndres Morales2014-10-071-1/+0
| | | | | Bug:17883273 Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
* Remove dead NFC unlock code from fw/baseAndres Morales2014-10-061-12/+0
| | | | | Bug:17883273 Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
* Merge "Add hidden API to disable NFC (optional persist)." into lmp-devMartijn Coenen2014-09-261-0/+14
|\
| * Add hidden API to disable NFC (optional persist).Martijn Coenen2014-09-251-0/+14
| | | | | | | | | | Bug: 17298769 Change-Id: I1fa59592a34f1207731dc75d2e548b3e614d94f5
* | Upper-case incoming AIDs.Martijn Coenen2014-09-162-9/+8
|/ | | | | | | | | 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
* Merge "Fix static AID prefix registration." into lmp-devMartijn Coenen2014-09-161-1/+1
|\
| * Fix static AID prefix registration.Martijn Coenen2014-09-161-1/+1
| | | | | | | | | | Bug: 16517161 Change-Id: Ibaddf8720907f1d28d44231d927f538628bbf9d0
* | Merge "AID prefix registration." into lmp-devMartijn Coenen2014-09-164-3/+31
|\ \ | |/
| * AID prefix registration.Martijn Coenen2014-09-084-3/+31
| | | | | | | | | | Bug: 16517161 Change-Id: I4e008b84fd1372b17a98437ec8a6b71c33d7cd05
* | Add hidden API for pausing and resuming NFC polling.Andres Morales2014-09-112-0/+29
|/ | | | | Bug:17401266 Change-Id: Icce34787fc89dc33445f6c36f40f669a8b9b2f92
* Remove old NFC unlock apiAndres Morales2014-08-192-31/+0
| | | | | Bug: 16401635 Change-Id: I667d91c2346355ed0a2115644e6192f5f208e288
* Fix issue where unlock handlers are not properly updatedAndres Morales2014-08-152-16/+25
| | | | | | | | 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
* NFC Unlock api changesAndres Morales2014-07-314-3/+103
| | | | | Bug: 16401635 Change-Id: I994bd80be40052c2f894199bb44ebbde40077f27
* Revert "NFC Unlock api changes"Andres Morales2014-07-304-103/+3
| | | | | | This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335. Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3
* NFC Unlock api changesAndres Morales2014-07-304-3/+103
| | | | | Bug: 16401635 Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
* Make some NFC APIs @systemAPI.Martijn Coenen2014-07-301-1/+7
| | | | Change-Id: I12e292563a517211e4fae7a1f64021758f396d1a
* Add API to query for AID prefix support.Martijn Coenen2014-07-021-0/+15
| | | | | | | | | 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
* Clean up dynamic AID XML parser.Martijn Coenen2014-07-021-11/+28
| | | | | | | <aid-group> should be generated and parsed in its own object. Change-Id: I70f4511a682c66f8d11b7797a0f171cda24cc617
* Move AID validation to CardEmulation.Martijn Coenen2014-07-023-36/+39
| | | | | | | More logical place since it's a generic utility function. Change-Id: I3381f10d6720e415d091dbd475ef0df8733e7e75
* Add new IPC for direct Beam invoke.Martijn Coenen2014-07-012-1/+19
| | | | | | | | | 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
* Validate AIDs when registered.Martijn Coenen2014-07-012-7/+29
| | | | Change-Id: Ib7140c30a8a7587f1809f529d3303e69933bb245
* Make unlock api take String instead of int codesAndres Morales2014-06-202-2/+41
| | | | | | int code method not exposed to third parties Change-Id: I18ad0703be9d06664db3fd00a6435f789979fe73
* Framework changes to support NFC trustlet.Andres Morales2014-06-203-0/+42
| | | | | | | Adds a system-only ability to register for receiving tags from NfcService at the lockscreen. Change-Id: I4b50941031e8d1f40ebb6314211226e70a2ad187
* Address HCE API review comments.Martijn Coenen2014-05-292-32/+36
| | | | | | | Remove AidGroup from public APIs. Bug: 15089341 Change-Id: Ia8e038a12891abc6f1a8e82dbf30b8952e0b1fd7
* Revert "Adding INfcUnlockSettings and NfcUnlock interface class."Andres Morales2014-05-204-351/+0
| | | | | | | | This will be re-added as a Trustlet in a subsequent CL. This reverts commit 38a7ed05f8fed0aa81f7214d827875f9876ffbe1. Change-Id: I5aa36df42a7751f165b4ef184e0cda57e5568b59
* HCE/SE foreground support.Martijn Coenen2014-05-064-12/+152
| | | | | | | | 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
* Dynamic AID registration APIs for HCE.Martijn Coenen2014-04-235-108/+420
| | | | | | | | 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
generated by cgit v1.1 at 2024-09-17 09:56:16 +0000