summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Re-add quotes for network key and ssidandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r2android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-fi-releaselollipop-mr1-devAndres Morales2015-02-041-2/+2
* Material Beam icon.Martijn Coenen2015-01-265-0/+0
* 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
* | Import translations. DO NOT MERGEGeoff Mendal2014-12-102-18/+18
* | 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
| |/
* | Import translations. DO NOT MERGEGeoff Mendal2014-12-082-18/+18
* | 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
| |/
* | 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
* | | 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
| |/
* / Fix issue where Beam is disabled in SWAndres Morales2014-12-031-1/+1
|/
* Read UserHandle from passed in ShareDataAndres Morales2014-12-021-1/+3
* Import translations. DO NOT MERGEGeoff Mendal2014-12-013-3/+3
* Import translations. DO NOT MERGEGeoff Mendal2014-11-2654-108/+54
* Merge "Fix NfcDiscoveryParameters" into lmp-mr1-devAndres Morales2014-11-241-2/+5
|\
| * Fix NfcDiscoveryParametersAndres Morales2014-11-241-2/+5
* | Import translations. DO NOT MERGEGeoff Mendal2014-11-2472-370/+328
|/
* 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
* | 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-194-5/+49
|\ \
| * | Add toast to tell the user Beam is busyAndres Morales2014-11-184-5/+49
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-1972-526/+766
* | | 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-172-25/+35
|\ \ \ | | |/ | |/|
| * | Make BT pairing strings localizableAndres Morales2014-11-132-25/+35
* | | 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
| |/
* / 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
|\ \
| * \ am 5443a8f5: Don\'t scale Beam screenshot.Martijn Coenen2014-10-201-1/+1
| |\ \
| | * | Don't scale Beam screenshot.lollipop-devMartijn Coenen2014-10-201-1/+1
* | | | am 0cee34f9: (-s ours) am 4a20d330: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-200-0/+0
|\| | |
| * | | am 4a20d330: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-200-0/+0
| |\| |
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-10-202-4/+4
* | | | 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
* | | | | am 60740802: am 672cb703: Merge "Changes for Beam memory" into lmp-devAndres Morales2014-10-152-2/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 672cb703: Merge "Changes for Beam memory" into lmp-devAndres Morales2014-10-152-2/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Changes for Beam memory" into lmp-devAndres Morales2014-10-152-2/+4
| | |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-09 22:15:25 +0000