summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* #688 Add missing importbugfix/issue_688Tuan Nguyen2018-03-061-0/+1
* #688 Handle a RuntimeException crashTuan Nguyen2018-03-061-0/+1
* Merge pull request #682 from smartdevicelink/bugfix/issue_660Joey Grover2018-03-062-1/+227
|\
| * spacing issuesBretty White2018-03-061-18/+18
| * fix spacing and address commentsBretty White2018-03-061-3/+3
| * check size of cleaned mapBretty White2018-03-061-15/+18
| * 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 branch 'master' into developJoey Grover2018-03-061-1/+1
|\ \
| * \ Merge pull request #694 from smartdevicelink/hotfix/issue_693Joey Grover2018-03-061-1/+1
| |\ \
| | * | Update datehotfix/issue_693theresalech2018-02-271-1/+1
| |/ /
* | | Fix issue #691 (#692)Joey Grover2018-02-271-2/+3
* | | Merge pull request #690 from smartdevicelink/feature/Issue_689Joey Grover2018-02-271-1/+1
|\ \ \
| * | | Add the array boundary fix to if statement in deployNextRouterServicefeature/Issue_689Bilal2018-02-261-2/+2
| * | | Fix array boundary issue in deployNextRouterServiceBilal2018-02-261-1/+1
|/ / /
* | | Merge pull request #686 from smartdevicelink/feature/metdataJoey Grover2018-02-237-192/+528
|\ \ \ | |_|/ |/| |
| * | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...feature/metdataJoey Grover2018-02-2110-282/+394
| |\ \ | |/ / |/| |
* | | 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
|/ / /
| | * Add the next up method for the router serviceJoey Grover2018-02-211-2/+31
| | * Clean up method and add javadocsJoey Grover2018-02-211-8/+43
| | * Add unit tests and fix issue found.Joey Grover2018-02-212-2/+202
| | * Add a broadcast after starting newest service for old version checkingJoey Grover2018-02-141-0/+7
| | * Update to accommodate metdata moving to router service instead of receiverJoey Grover2018-02-145-50/+35