summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | * | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-060-0/+0
| | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-020-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-010-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-190-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-090-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to masterThe Android Automerger2016-02-040-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | |/| | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Allow system_server access to NFC reader mode API. am: 8561f64804 am: 6c6a969...Martijn Coenen2016-06-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Allow system_server access to NFC reader mode API. am: 8561f64804 am: 6c6a969835Martijn Coenen2016-06-211-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Allow system_server access to NFC reader mode API. am: 8561f64804Martijn Coenen2016-06-211-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-211-2/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-211-2/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow system_server access to NFC reader mode API." into nyc-devMartijn Coenen2016-06-211-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-211-2/+3
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | | | | | Allow peripheral/WiFi handover in provision mode.Martijn Coenen2016-06-211-10/+10
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | / / / / / / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEBill Yi2016-06-033-5/+5
| |_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-243-0/+203
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE)Martijn Coenen2016-05-243-0/+203
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE)Martijn Coenen2016-05-233-0/+203
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-241-1/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-241-1/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-241-1/+8
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-241-1/+8
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-241-1/+8
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bdMartijn Coenen2016-05-241-1/+8
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground.Martijn Coenen2016-05-241-1/+8
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground.Martijn Coenen2016-05-231-1/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Verify setForegroundDispatch caller is in foreground." into nyc-devMartijn Coenen2016-05-241-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground.Martijn Coenen2016-05-231-1/+8
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-05-219-19/+19
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2016-05-041-2/+2
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Fix API review comments, add remove callback.Martijn Coenen2016-04-271-34/+81
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Only add service when object is complete initialized.Martijn Coenen2016-04-111-2/+4
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Nfc shouldn't initiate bluetooth connection if disallowed." into nyc-devNicolas Prévot2016-04-051-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Nfc shouldn't initiate bluetooth connection if disallowed.Nicolas Prevot2016-04-041-0/+8
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | | | Don't use UserHandle.CURRENT when fetching user restrictions.Nicolas Prevot2016-04-041-1/+4
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow foreground override in provision mode." into nyc-devMartijn Coenen2016-03-301-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Allow foreground override in provision mode.Martijn Coenen2016-03-291-11/+11
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | Don't disable NFC in airplane mode.Martijn Coenen2016-03-291-59/+1
|/ / / / / / / / / / / / / / / / / / / / / /