summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refs/heads/hotfix/improve_on_system_request' into sdl_android_p...release/3.4.0Mike 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
| * 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 #94 from hotfix/apt_bin_data_fix3.1.5Mike Burke2015-02-041-7/+2
* | | Merge branch 'refs/heads/feature/jingle_class_to_enum' into sdl_android_paren...Mike Burke2015-03-092-0/+33
|\ \ \
| * | | Deprecated Jingles class and added Jingle enumMike Burke2015-02-232-0/+33
* | | | Merge branch 'refs/heads/feature/new_rpcs' into sdl_android_parent/developMike Burke2015-03-0912-18/+1229
|\ \ \ \
| * | | | Added missing parameters to ChangeRegistration. Fixes #104.Mike Burke2015-02-181-1/+139
| * | | | Implemented SendLocation APIs. Fixes #105Mike Burke2015-02-183-0/+234
| * | | | Added ecuHeader field to GetDTCsResponse. Fixes #117Mike Burke2015-02-181-17/+36
| * | | | Implemented TBT APIs. Fixes #109Mike Burke2015-02-187-0/+820
* | | | | Fixes #79 and #91Mike Burke2015-02-2372-96/+392
* | | | | Fixes #103Mike Burke2015-02-231-1/+3
| |/ / / |/| | |
* | | | Merge branch 'refs/heads/hotfix/sdl_choice_constructor' into sdl_android_pare...Mike Burke2015-02-181-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Made SdlChoice constructor publicMike Burke2015-02-131-1/+1
* | | | 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 pull request #81 from smartdevicelink/hotfix/papt_null_pointer3.1.4Mike Burke2015-02-021-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fixes #80.Mike Burke2015-01-271-1/+1
| |/ / /
* | | | 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
| |/ / /
* | | | 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
| |/ /