summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removed merge warning3.3.1Mike Burke2015-03-091-1/+0
* Merge branch 'refs/heads/hotfix/improve_on_system_request' into sdl_android_p...Mike Burke2015-03-091-82/+78
|\
| * Removed TODO comment.Mike Burke2015-02-241-1/+0
| * Better bulk data handling in OnSystemRequestMike Burke2015-02-231-82/+79
* | Fix merge error with VrCapabilities3.3.0Mike Burke2015-03-091-2/+6
* | Merge branch 'refs/heads/release/3.3.0' into sdl_android_parent/masterMike Burke2015-03-0917-105/+400
|\ \
| * | Cleaning up merge warningsMike Burke2015-02-162-4/+6
| * | Merge branch 'refs/heads/feature/update_capabilities_on_display_layout' into ...Mike Burke2015-02-161-0/+9
| |\ \
| | * | Fixes #53Mike Burke2015-01-271-0/+9
| * | | Merge branch 'refs/heads/feature/refactor_fuel_level_state' into sdl_android_...Mike Burke2015-02-167-53/+221
| |\ \ \
| | * | | Fixes #84Mike Burke2015-01-307-53/+221
| * | | | Merge branch 'refs/heads/feature/refactor_vr_capabilities' into sdl_android_p...Mike Burke2015-02-161-5/+15
| |\ \ \ \
| | * | | | Removed unneeded class nameMike Burke2015-01-301-1/+1
| | * | | | Fixes #89Mike Burke2015-01-301-5/+15
| | |/ / /
| * | | | Merge branch 'refs/heads/vehicle_data_type_chk' into sdl_android_parent/developMike Burke2015-02-164-22/+68
| |\ \ \ \
| | * | | | Adjusted method name to follow java naming convention. Added a check to obje...Markos Rapitis2015-02-124-24/+27
| | * | | | Changes for checking type on Vehicle DataMarkos Rapitis2015-01-234-22/+65
| * | | | | Merge branch 'refs/heads/Enable_Disable_Siphon' into sdl_android_parent/developMike Burke2015-02-166-19/+71
| |\ \ \ \ \
| | * | | | | Removed Autogenerated CommentDahiya, Anil (A.)2015-02-051-1/+0
| | * | | | | Merge branch 'Enable_Disable_Siphon' of https://github.com/anildahiya/sdl_and...Dahiya, Anil (A.)2015-02-056-19/+72
| | |\ \ \ \ \
| | | * | | | | Changes for proper enabling and disabling of Siphon ServerDahiya, Anil (A.)2015-01-236-19/+72
| | | |/ / / /
| * | | | | | Merge pull request #94 from hotfix/apt_bin_data_fixMike Burke2015-02-041-7/+2
| * | | | | | Merge branch 'refs/heads/sdl_android_parent/master' into sdl_android_parent/d...Mike Burke2015-02-021-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'refs/heads/hotfix/enum_improvements' into sdl_android_parent/ma...3.2.2Mike Burke2015-02-23124-972/+516
|\ \ \ \ \ \ \
| * | | | | | | Removed try/catch blocks from calls to valueForString on enumsMike Burke2015-02-1852-877/+127
| * | | | | | | Fixes #119Mike Burke2015-02-181-0/+3
| * | | | | | | Fixes #79 and #91Mike Burke2015-02-1872-94/+382
| * | | | | | | Fixes #102Mike Burke2015-02-181-1/+4
* | | | | | | | Merge branch 'refs/heads/hotfix/set_bulk_data_null_input' into sdl_android_pa...Mike Burke2015-02-231-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fixes #103Mike Burke2015-02-181-1/+3
| |/ / / / / /
* | | | | | | Made SdlChoice constructor public3.2.1Mike Burke2015-02-181-1/+1
|/ / / / / /
* | | | | | Merge branch 'refs/heads/release/3.2.0' into sdl_android_parent/master3.2.0Mike Burke2015-02-165-11/+45
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #76 from mrapitis/send_broadcast_exception_fixMike Burke2015-01-261-2/+9
| |\ \ \ \ \
| | * | | | | Catching an exception in sendbroadcast if service unexpectedly becomes unavai...Rapitis, Markos (M.J.)2015-01-231-2/+9
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #73 from mrapitis/get_audio_passthrough_cap_fixMike Burke2015-01-262-0/+23
| |\ \ \ \ \
| | * | | | | Changes for Implementation of getAudioPassThruCapabilities getter in proxy ob...Rapitis, Markos (M.J.)2015-01-232-0/+23
| | |/ / / /
| * | | | | Merge pull request #72 from anildahiya/BlueTooth_Socket_ExceptionMike Burke2015-01-261-2/+10
| |\ \ \ \ \
| | * | | | | Changing SYNC to SDLDahiya, Anil (A.)2015-01-231-2/+2
| | * | | | | Changes for throwing BLUETOOTH_SOCKET_UNAVAILABLE exception when No SDP Port ...Dahiya, Anil (A.)2015-01-231-2/+10
| | |/ / / /
| * | | | | Merge pull request #55 from mikeburke106/origin/feature/display_capabilities_...Mike Burke2015-01-261-1/+1
| |\ \ \ \ \
| | * | | | | Fixes #52Mike Burke2015-01-221-1/+1
| * | | | | | Merge pull request #54 from mikeburke106/origin/feature/put_file_hotfixMike Burke2015-01-261-6/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Fixes #48Mike Burke2015-01-221-6/+2
| | |/ / / /
* | | | | | Merge pull request #94 from hotfix/apt_bin_data_fix3.1.5Mike Burke2015-02-041-7/+2
| |_|_|/ / |/| | | |
* | | | | Merge pull request #81 from smartdevicelink/hotfix/papt_null_pointer3.1.4Mike Burke2015-02-021-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixes #80.Mike Burke2015-01-271-1/+1
|/ / / /
* | | | Fixed location of contributing fileMike Burke2015-01-261-0/+0
* | | | Merge pull request #70 from mikeburke106/hotfix/Contributing_FileMike Burke2015-01-261-0/+16
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add a CONTRIBUTING fileMike Burke2015-01-221-0/+16
| |/ /
| * | Merge branch 'refs/heads/sdl_android_parent/develop' into origin/developMike Burke2014-12-176-21/+88
| |\ \ | | |/
View Lorry Controller Status