summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Verify setForegroundDispatch caller is in foreground.stable/cm-12.1-YOG4PMartijn Coenen2016-07-081-1/+8
| | | | | | | Bug: 28300969 CYNGNOS-3020 Change-Id: Icadfe70cd06f921badd266e7a4efbae15a8c206a (cherry picked from commit 0889ac84bd8325b41583033ac7597e020fd24600)
* Automatic translation importAbhisek Devkota2016-06-1317-0/+665
| | | | | Change-Id: I6c58aa72b1141dfecde6c4f59f93292153243427 Ticket: RM-154
* nfc: create a bootstrap serviceJorge Ruesga2015-09-082-0/+41
| | | | | | | | | | | | | | | | | Since registration of NfcService as a manager service happens in the first run of the Nfc app, and since the SystemUi makes use of this manager service through the NfcTile, NfcManager can lead into a null reference for the NfcAdapter because the NfcService isn't registered when the SystemUi starts (this condition depends on the device speed to bring up the call to the apps). This change adds a noop service that allow to be called by SystemServer before start the systemui and ensure that NfcService is available before apps start using NfcManager. Additional info: http://review.cyanogenmod.org/#/c/108411 TICKET: CYNGNOS-848 Change-Id: I052ab0cfc8b62fbc3798ab3c0d0eccfad01419ff Signed-off-by: Jorge Ruesga <jorge@ruesga.com> (cherry picked from commit f5f5eef3380b84b3e8bb1c6d8f2683abfa651568)
* Automatic translation importMichael Bestas2015-07-281-0/+8
| | | | | | CYNGNOS-264 Change-Id: I63db10dca034bb11a0ccf99df470b830770f3bbf (cherry picked from commit 9feec31fd73899457684994573e22bc692e067b9)
* Automatic translation importMichael Bestas2015-05-162-14/+1
| | | | Change-Id: Id9ebfad9a369c725d6077e1a0e4a408ba0a2fe92
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3CRicardo Cerqueira2015-03-10110-1773/+2272
|\ | | | | | | Android 5.1.0 release 1
| * Re-add quotes for network key and ssidAndres Morales2015-02-041-2/+2
| | | | | | | | | | | | | | Otherwise the wpa_supplicant does not interpret them properly Bug:18958216 Change-Id: I1c05190e745819f4f0e768206afae147124a3616
| * Material Beam icon.Martijn Coenen2015-01-265-0/+0
| | | | | | | | | | Bug: 17459786 Change-Id: Id5799cf31a5235d623d548c05c6b8a86107ee5e7
| * Merge "Only set WPA_PSK for WPA_PSK and WPA2_PSK" into lmp-mr1-devAndres Morales2015-01-211-7/+1
| |\
| | * Only set WPA_PSK for WPA_PSK and WPA2_PSKAndres Morales2015-01-091-7/+1
| | | | | | | | | | | | | | | Bug: 18958216 Change-Id: Ib21b4417fa2ff618790f6c27016860400fdbb43d
| * | Import translations. DO NOT MERGEGeoff Mendal2014-12-102-18/+18
| | | | | | | | | | | | | | | Change-Id: Ibbc7763b8a5cab7dd69d79df60f9656b49904f87 Auto-generated-cl: translation import
| * | Merge "Remove asterisk from AID when removing prefix entries" into lmp-mr1-devAndres Morales2014-12-101-1/+17
| |\ \
| | * | Remove asterisk from AID when removing prefix entriesPaul Chaisson2014-12-081-1/+17
| | |/ | | | | | | | | | | | | Bug:18663996 Change-Id: Ic4cb547ed3c8072599e271bddb63cce875834c4e
| * | Import translations. DO NOT MERGEGeoff Mendal2014-12-082-18/+18
| | | | | | | | | | | | | | | Change-Id: I0a308dfe1bd907e591a7bbc3da58d1a3b3321407 Auto-generated-cl: translation import
| * | Merge "Remove B' polling for B tags" into lmp-mr1-devAndres Morales2014-12-041-2/+1
| |\ \
| | * | Remove B' polling for B tagsAndres Morales2014-12-041-2/+1
| | |/ | | | | | | | | | | | | Bug: 18613259 Change-Id: Ic5b19e7953250647dc9cf7802dd04815a80a1141
| * | Merge "Fix crash in ReaderMode API for Nakasi" into lmp-mr1-devAndres Morales2014-12-041-1/+1
| |\ \
| | * | Fix crash in ReaderMode API for NakasiAndres Morales2014-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://code.google.com/p/android/issues/detail?id=80953&q=nfc&colspec=ID%20Type%20Status%20Owner%20Summary%20Stars Bug:18611560 Change-Id: I0f12b5b569ae32d604a106feb3334f4092c43b34
| * | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-12-042-18/+18
| |\ \ \ | | |/ / | |/| |
| | * | Import translations. DO NOT MERGEGeoff Mendal2014-12-032-18/+18
| | |/ | | | | | | | | | | | | Change-Id: I97295fd21267cd2586b3bbadf68b4e9a3d4b2b12 Auto-generated-cl: translation import
| * / Fix issue where Beam is disabled in SWAndres Morales2014-12-031-1/+1
| |/ | | | | | | | | | | | | | | | | If the screen is locked we don't persist the proper state, causing NFC P2P to be disabled until SW completes, breaking EDU provisioning. Bug: 18534741 Change-Id: I96b8f70a7b3c58e0690c2f2fc69776e15ec41806
| * Read UserHandle from passed in ShareDataAndres Morales2014-12-021-1/+3
| | | | | | | | | | | | | | | | | | When Beam is manually invoked, ShareData can be passed in, must read out UserHandle in this branch. Bug:18581279 Change-Id: Id9b0d4e27ec60fb16b16b92f063009a20280e410
| * Import translations. DO NOT MERGEGeoff Mendal2014-12-013-3/+3
| | | | | | | | | | Change-Id: Ica5ee9ed0d818bfd7eda5434ba9ce9539587e42e Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEGeoff Mendal2014-11-2654-108/+54
| | | | | | | | | | Change-Id: Ief73c00af2e7bbac6bf330fe6487369d22ede5aa Auto-generated-cl: translation import
| * Merge "Fix NfcDiscoveryParameters" into lmp-mr1-devAndres Morales2014-11-241-2/+5
| |\
| | * Fix NfcDiscoveryParametersAndres Morales2014-11-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Added a new field without adding it to .equals(). Leads to P2P not getting enabled in SW. Bug: 18501664 Change-Id: I602045cbbd84a87edff5b82a3c0db96c9159e21f
| * | Import translations. DO NOT MERGEGeoff Mendal2014-11-2472-370/+328
| |/ | | | | | | | | Change-Id: I59de871c7a2a1400d552ba56f43ff47fcb78f1a6 Auto-generated-cl: translation import
| * Merge "Prevent Beam at the lockscreen and during provisioning" into lmp-mr1-devAndres Morales2014-11-206-22/+56
| |\
| | * Prevent Beam at the lockscreen and during provisioningAndres Morales2014-11-196-23/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can poll at the lockscreen not for unlock tags, need to explicitly disable Beam. Also since we allow peripheral handover during provisioning, we started allowing Beam as well. Blocking that. Bug: 18349433 Change-Id: I987f43228d2c003c66201d2e91bd9bdfebd49d78
| * | Merge "Add verifyNfcPermission()." into lmp-mr1-devMartijn Coenen2014-11-201-0/+5
| |\ \
| | * | Add verifyNfcPermission().Martijn Coenen2014-11-131-0/+5
| | |/ | | | | | | | | | | | | Bug: 18358968 Change-Id: I5d0e705fa115cef25653aa198b65f0c805e2553c
| * | Merge "Add toast to tell the user Beam is busy" into lmp-mr1-devAndres Morales2014-11-194-5/+49
| |\ \
| | * | Add toast to tell the user Beam is busyAndres Morales2014-11-184-5/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up CL for b/17966846 Bug: 17966846 Change-Id: I7fad0c31cbedc278fa9354765f3612501cd8c672
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-11-1972-526/+766
| | | | | | | | | | | | | | | | | | | | Change-Id: I5efca478e56db12fe972b6e3271ee929f5059f93 Auto-generated-cl: translation import
| * | | Merge "Restrict RF Field events to preferred app." into lmp-mr1-devMartijn Coenen2014-11-193-3/+46
| |\ \ \
| | * | | Restrict RF Field events to preferred app.Martijn Coenen2014-11-123-3/+46
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If any of the packages in nfcee_extras.xml is preferred (either tap&pay or foreground), only that app will get RF field events. Otherwise, all apps in nfcee_extras will get the events. Long term solution will be to reduce reliance on RF field events (which doesn't scale), and instead tie this to AID selection. Bug: 18358874 Change-Id: I29276b8929f48b8ca33d61c4120a7405c0ab4dcf
| * | | Merge "Make BT pairing strings localizable" into lmp-mr1-devAndres Morales2014-11-172-25/+35
| |\ \ \ | | | |/ | | |/|
| | * | Make BT pairing strings localizableAndres Morales2014-11-132-25/+35
| | | | | | | | | | | | | | | | | | | | Bug:18207126 Change-Id: I8600e5d8cde75074205d822b819b4fb08e7e4a1d
| * | | Merge "Refactor Beam to work with managed profiles" into lmp-mr1-devAndres Morales2014-11-1722-1116/+1274
| |\| |
| | * | Refactor Beam to work with managed profilesAndres Morales2014-11-1222-1116/+1274
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify logic and break out different components into their own services. Allow BeamShareData to pass a UserHandle in order to start the transfer in the correct user. Bug: 17966846 Change-Id: I012a9ebe87deca6fceb857da8c8d4e2ecbeca6fe
| * / Parse auth type from WPS tagAndres Morales2014-11-121-84/+85
| |/ | | | | | | | | | | | | also make parsing more robust and readable Bug: 18255874 Change-Id: Iebe90d0b78654d3e2b515b709bc145a9824560c6
| * Merge "Deactivate Beam when DISALLOW_OUTGOING_BEAM is set." into lmp-mr1-devBenjamin Franz2014-10-282-6/+51
| |\
| | * Deactivate Beam when DISALLOW_OUTGOING_BEAM is set.Benjamin Franz2014-10-222-6/+51
| | | | | | | | | | | | | | | Bug: 18008824 Change-Id: I25b64f0de6e62a94ba59b3ff6ea40c14da25ca90
| * | Merge "Reactivate Beam sharing for managed profiles." into lmp-mr1-devBenjamin Franz2014-10-282-6/+4
| |\ \
| | * | Reactivate Beam sharing for managed profiles.Benjamin Franz2014-10-152-6/+4
| | |/ | | | | | | | | | | | | Bug: 17916693 Change-Id: I41f2a0e45378365a0ef7c042067c85d234b1a00b
| * | am 6fda4eba: am 5443a8f5: Don\'t scale Beam screenshot.Martijn Coenen2014-10-201-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '6fda4eba9c23e47f9a4fe9ad43412eca02d9d8c5': Don't scale Beam screenshot.
| | * \ am 5443a8f5: Don\'t scale Beam screenshot.Martijn Coenen2014-10-201-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '5443a8f5b786bfc03633ea5821d95dffc856e3e8': Don't scale Beam screenshot.
| * | | | am 0cee34f9: (-s ours) am 4a20d330: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '0cee34f962d020226992018f3319d5553f6699e2': Import translations. DO NOT MERGE
| | * | | am 4a20d330: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-200-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a20d330e4b2c7d11164bc8d06022548ed417a9d': Import translations. DO NOT MERGE
| * | \ \ \ Merge "Set BT device alias from NFC tag" into lmp-mr1-devAndres Morales2014-10-171-0/+3
| |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 10:47:06 +0000