summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3CRicardo Cerqueira2015-03-1027-1245/+1560
|\
| * Re-add quotes for network key and ssidAndres Morales2015-02-041-2/+2
| * 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
| * | 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
| | |/
| * / Remove B' polling for B tagsAndres Morales2014-12-041-2/+1
| |/
| * Read UserHandle from passed in ShareDataAndres Morales2014-12-021-1/+3
| * Fix NfcDiscoveryParametersAndres Morales2014-11-241-2/+5
| * Merge "Prevent Beam at the lockscreen and during provisioning" into lmp-mr1-devAndres Morales2014-11-202-9/+21
| |\
| | * Prevent Beam at the lockscreen and during provisioningAndres Morales2014-11-192-10/+21
| * | Merge "Add verifyNfcPermission()." into lmp-mr1-devMartijn Coenen2014-11-201-0/+5
| |\ \
| | * | Add verifyNfcPermission().Martijn Coenen2014-11-131-0/+5
| | |/
| * | Merge "Add toast to tell the user Beam is busy" into lmp-mr1-devAndres Morales2014-11-193-5/+48
| |\ \
| | * | Add toast to tell the user Beam is busyAndres Morales2014-11-183-5/+48
| * | | 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
| | | |/ | | |/|
| * | | Merge "Make BT pairing strings localizable" into lmp-mr1-devAndres Morales2014-11-171-18/+17
| |\ \ \ | | | |/ | | |/|
| | * | Make BT pairing strings localizableAndres Morales2014-11-131-18/+17
| * | | Merge "Refactor Beam to work with managed profiles" into lmp-mr1-devAndres Morales2014-11-1721-1114/+1266
| |\| |
| | * | Refactor Beam to work with managed profilesAndres Morales2014-11-1221-1114/+1266
| | |/
| * / Parse auth type from WPS tagAndres Morales2014-11-121-84/+85
| |/
| * 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
| * | 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
| | |/
| * | am 6fda4eba: am 5443a8f5: Don\'t scale Beam screenshot.Martijn Coenen2014-10-201-1/+1
| |\ \
| * \ \ Merge "Set BT device alias from NFC tag" into lmp-mr1-devAndres Morales2014-10-171-0/+3
| |\ \ \
| | * | | Set BT device alias from NFC tagAndres Morales2014-10-021-0/+3
* | | | | NFCService: Add sysprop to prevent FW download during boot with NFC off.stable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1ITony Layher2015-02-151-1/+12
| |_|/ / |/| | |
* | | | Don't scale Beam screenshot.Martijn Coenen2014-10-201-1/+1
|/ / /
* | | Merge "Changes for Beam memory" into lmp-devAndres Morales2014-10-152-2/+4
|\ \ \
| * | | Changes for Beam memoryAndres Morales2014-10-142-2/+4
* | | | Merge "Revert "Do Beam UI outside NFC persistent process"" into lmp-devAndres Morales2014-10-153-344/+137
|\| | | | |_|/ |/| |
| * | Revert "Do Beam UI outside NFC persistent process"Andres Morales2014-10-143-344/+137
* | | Disable service cache debug.Martijn Coenen2014-10-091-1/+1
|/ /
* | Disable polling after KB pairing debounce timeoutAndres Morales2014-10-081-2/+19
* | Remove dead code from NfcDispatcherAndres Morales2014-10-061-6/+0
|/
* Merge "Fix bugs in AID prefix conflict resolution." into lmp-devMartijn Coenen2014-09-263-7/+22
|\
| * Fix bugs in AID prefix conflict resolution.Martijn Coenen2014-09-263-7/+22
* | Merge "Catch any exception from remote in unlock handler" into lmp-devAndres Morales2014-09-261-2/+1
|\ \
| * | Catch any exception from remote in unlock handlerAndres Morales2014-09-241-2/+1
| |/
* / Change polling timeout to 35s from 20sAndres Morales2014-09-241-1/+1
|/
* Merge "Do Beam UI outside NFC persistent process" into lmp-devAndres Morales2014-09-233-137/+344
|\
| * Do Beam UI outside NFC persistent processAndres Morales2014-09-183-137/+344
* | Merge "Remove DBG logging." into lmp-devMartijn Coenen2014-09-194-4/+4
|\ \
| * | Remove DBG logging.Martijn Coenen2014-09-184-4/+4
* | | Merge "Allow Wi-Fi tags in SetupWizard" into lmp-devAndres Morales2014-09-191-1/+1
|\ \ \
| * | | Allow Wi-Fi tags in SetupWizardAndres Morales2014-09-181-1/+1
| | |/ | |/|
* | | Prefix registration fixes.Martijn Coenen2014-09-162-3/+13
| |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 10:14:20 +0000