summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fixed test errorbugfix/issue_660Bretty White2018-02-281-1/+1
* fix per reviewBretty White2018-02-281-1/+1
* more spacing stuffBretty White2018-02-281-6/+5
* attempting to fix spacing issueBretty White2018-02-281-112/+111
* remove unnecessary assert statementBretty White2018-02-161-2/+0
* fix commentBretty White2018-02-161-1/+1
* remove unnecessary logsBretty White2018-02-161-6/+1
* finish testsBretty White2018-02-162-11/+96
* committing progressBretty White2018-02-152-132/+175
* start of testsBretty White2018-02-151-0/+79
* cleaned up commentsBretty White2018-02-141-3/+3
* catch UAI race conditionBretty White2018-02-141-0/+25
* Merge pull request #680 from smartdevicelink/bugfix/issue_616Joey Grover2018-02-121-1/+3
|\
| * fix potential NPEBretty White2018-02-121-1/+3
* | Merge pull request #675 from smartdevicelink/feature/router_service_cleanupJoey Grover2018-02-121-271/+262
|\ \ | |/ |/|
| * Clean up of router service code. Fixes #674feature/router_service_cleanupJoey Grover2018-02-071-271/+262
* | Merge branch 'master' into developJoey Grover2018-02-091-1/+20
|\ \ | |/ |/|
| * Merge pull request #678 from smartdevicelink/bugfix/issue_676Joey Grover2018-02-091-1/+20
| |\
| | * changed to master update readmeBretty White2018-02-091-1/+20
| |/
* | Merge pull request #667 from smartdevicelink/feature/issue_600Joey Grover2018-01-317-4/+93
|\ \
| * | add comment to class javadocBretty White2018-01-311-0/+7
| * | updated failing unit testfeature/issue_600Brett W2018-01-171-0/+4
| * | updated javadocsBrett W2018-01-171-2/+2
| * | fixed testsBrett W2018-01-174-17/+40
| * | added pcm testsBrett W2018-01-171-2/+14
| * | start of pcm RAIR parsingBrett W2018-01-164-1/+44
* | | Merge pull request #669 from smartdevicelink/bugfix/issue_666Joey Grover2018-01-311-0/+1
|\ \ \
| * | | add return to getCapabilitybugfix/issue_666Bretty White2018-01-241-0/+1
| |/ /
* | | Merge pull request #673 from smartdevicelink/bugfix/issue_662Joey Grover2018-01-311-13/+11
|\ \ \ | |/ / |/| |
| * | remove unneeded logicbugfix/issue_662Bretty White2018-01-301-13/+11
|/ /
* | Merge pull request #653 from smartdevicelink/bugfix/issue_652Joey Grover2017-12-211-2/+7
|\ \ | |/ |/|
| * Additional check for checking if we have a remote display active before calli...bugfix/issue_652Anil Dahiya2017-12-211-1/+3
| * Changes to fix start / stop of video stream with remote display.Markos Rapitis2017-11-211-2/+5
|/
* Merge branch 'release/4.4.0-rc1' of https://github.com/smartdevicelink/sdl_an...4.4.0Joey Grover2017-10-30334-8875/+20879
|\
| * Update CHANGELOGrelease/4.4.0-rc1Joey Grover2017-10-301-30/+41
| * Merge pull request #646 from smartdevicelink/bugfix/issues638_643Joey Grover2017-10-261-3/+3
| |\
| | * Set accepted video params for protocol versions less than 5bugfix/issues638_643Joey Grover2017-10-261-3/+3
| * | Merge pull request #645 from smartdevicelink/bugfix/issue_633Joey Grover2017-10-251-1/+2
| |\ \
| | * | Update RadioControlData documentation Joey Grover2017-10-251-2/+1
| | * | update documentation per Evo Probugfix/issue_633Brett W2017-10-251-1/+3
| |/ /
| * | Merge pull request #642 from smartdevicelink/bugfix/issue_641Joey Grover2017-10-231-5/+4
| |\ \
| | * | move init into StartVideoStreamingBrett W2017-10-231-5/+4
| |/ /
| * | Merge pull request #639 from smartdevicelink/bugfix/issue_637Joey Grover2017-10-231-14/+21
| |\ \ | | |/ | |/|
| | * Fixes #637Joey Grover2017-10-231-14/+21
| |/
| * Update documentation for radioEnabled4.4.0-rc.1Joey Grover2017-10-171-0/+2
| * Fix potential NPE when retrieving capabilities and add isCapabilitySupported ...Joey Grover2017-10-171-2/+13
| * Merge pull request #614 from jthrun/feature/haptic_projectionJoey Grover2017-10-164-2/+323
| |\
| | * Fix timing of call to refreshHapticData() .John Thrun2017-10-141-4/+14
| | * Integrate with enhanced video streaming changes.John Thrun2017-10-133-37/+17
| | * Merge branch 'develop_f' into feature/haptic_projectionJohn Thrun2017-10-1322-425/+1534
| | |\ | | |/ | |/|