summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ | | |/
| * | Merge branch 'develop' of github.com:smartdevicelink/sdl_android into origin/...Mike Burke2014-10-272-3/+2
| |\ \
* | | | Create README.mdMike Burke2014-12-261-0/+8
| |_|/ |/| |
* | | Merge branch 'refs/heads/anildahiya/BugFix_KeyBoardProperty_ImageTypeSupporte...3.1.3Mike Burke2014-12-173-19/+33
|\ \ \
| * | | Additional Changes in setImageTypeSupported() method to take input as List of...Dahiya, Anil (A.)2014-12-122-2/+1
| * | | BugFix changes : getImageTypeSupported needs to return array, Proper Instance...Dahiya, Anil (A.)2014-11-253-17/+32
* | | | Merge branch 'refs/heads/anildahiya/AddedPutFileStreamParam' into sdl_android...Mike Burke2014-12-172-1/+54
|\ \ \ \
| * | | | Added additional parameters to putFileStream.Dahiya, Anil (A.)2014-11-252-1/+54
| |/ / /
| * | | Changes in getLockScreenStatus Method for Checking Null Pointer3.1.2Mike Burke2014-11-121-1/+1
| * | | Merge branch 'refs/heads/sdl_android_parent/hotfix' into sdl_android_parent/m...3.1.1Mike Burke2014-10-272-3/+2
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch 'refs/heads/sdl_android_parent/develop' into sdl_android_parent/...3.1.0Mike Burke2014-10-24163-3064/+3861
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/sdl_android_parent/hotfix' into sdl_android_parent/m...3.0.0Mike Burke2014-10-233-8/+8
| |\ \ \ \
* | | | | | Changes in getLockScreenStatus Method for Checking Null PointerMike Burke2014-11-121-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'refs/heads/sdl_android_parent/hotfix' into sdl_android_parent/d...Mike Burke2014-10-272-3/+2
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Hotfix for ChangeRegistration. Fixes #26Mike Burke2014-10-271-1/+1
| | |/ | |/|
* | | Merge branch 'refs/heads/anildahiya/NullInputHandling' into sdl_android_paren...Mike Burke2014-10-23143-2658/+3322
|\ \ \
| * | | Changes for handling null inputs in some of the RPC ClassesDahiya, Anil (A.)2014-10-2230-14/+154
| * | | Additional changes for Refactoring from Vector to ListDahiya, Anil (A.)2014-10-172-50/+13
| * | | Changes for Refactoring Vectors to ListDahiya, Anil (A.)2014-10-1634-426/+444
| * | | Refactoring constants from Names.Java to Corresponding RPC ClassesDahiya, Anil (A.)2014-10-14115-2674/+2624
| | |/ | |/|
* | | Fixed warnings in merge conflictsMike Burke2014-10-232-0/+2
* | | Merge branch 'refs/heads/origin/develop' into sdl_android_parent/developMike Burke2014-10-23156-419/+550
|\ \ \
| * | | Cleaned up 844 warning messages. Fixes #7Mike Burke2014-10-20156-419/+552
| |/ /
* | | Merge branch 'refs/heads/sdl_android_parent/hotfix' into sdl_android_parent/d...Mike Burke2014-10-233-8/+8
|\ \ \ | |/ / |/| / | |/