summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix TestValues from mergefeature/issue_871Henigan2021-01-271-0/+13
* Merge branch 'develop' into feature/issue_871Henigan2021-01-2719-39/+1240
|\
| * Merge pull request #1613 from smartdevicelink/bugfix/issue_1397Robert Henigan2021-01-271-4/+4
| |\
| | * Merge branch 'develop' into bugfix/issue_1397bugfix/issue_1397Julian Kast2021-01-2613-7/+1147
| | |\ | | |/ | |/|
| * | Merge pull request #1612 from smartdevicelink/bugfix/issue_1611Robert Henigan2021-01-261-0/+7
| |\ \
| | * | Apply suggestions from code reviewRobert Henigan2021-01-261-6/+2
| | * | Prevent potential npe on resolutionbugfix/issue_1611Henigan2021-01-261-0/+11
| * | | Merge pull request #1583 from LuxoftSDL/feature/0255_enchance_body_informationBilal Alsharifi2021-01-2612-7/+1140
| |\ \ \ | | |/ / | |/| |
| | * | [0255]kboskin2021-01-251-4/+16
| | * | [0255]kboskin2021-01-151-45/+35
| | * | Merge branch 'develop' into feature/0255_enchance_body_informationkboskin2021-01-1544-1227/+2490
| | |\ \
| | * | | [0255]kboskin2021-01-061-0/+1
| | * | | [0255]kboskin2020-12-292-9/+0
| | * | | [0255]kboskin2020-12-207-437/+430
| | * | | [0255]kboskin2020-12-121-1/+101
| | * | | [0255]kboskin2020-12-0916-315/+1361
| | | | * Fix print statements in the log tool to avoid starting the statement as Syste...Julian Kast2021-01-261-4/+4
| | |_|/ | |/| |
| * | | Merge pull request #1607 from smartdevicelink/deprecate-MediaClock-in-ShowRobert Henigan2021-01-222-18/+28
| |\ \ \
| | * | | Fixed spaceingJulian Kast2021-01-221-1/+1
| | * | | fix indentationHenigan2021-01-221-1/+1
| | * | | Fixed spacingJulian Kast2021-01-221-2/+2
| | * | | Deprecate mediaClock in Show.java and TextFieldName using the RPC Generatordeprecate-MediaClock-in-ShowJulian Kast2021-01-212-19/+29
| | | |/ | | |/|
| * | | Merge pull request #1609 from smartdevicelink/appInfo-RpcSpec-changeRobert Henigan2021-01-222-5/+67
| |\ \ \
| | * | | Add javaDoc info to AppInfo via the RPC GeneratorappInfo-RpcSpec-changeJulian Kast2021-01-211-1/+50
| | * | | Updated appInfo in RegisterAppInterface using the rpc GeneratorJulian Kast2021-01-211-4/+17
| | |/ /
| * | | Merge pull request #1602 from smartdevicelink/feature/issue_858Robert Henigan2021-01-211-5/+10
| |\ \ \ | | |/ / | |/| |
| | * | Revert spacing changesfeature/issue_858Bilal Alsharifi2021-01-141-1/+1
| | * | Revert spacing changeBilal Alsharifi2021-01-141-0/+1
| | * | Add initial delayBilal Alsharifi2021-01-142-2/+2
| | * | Fix unit testsBilal Alsharifi2021-01-141-2/+1
| | * | Use ScheduledExecutorService in SdlRemoteDisplayBilal Alsharifi2021-01-131-5/+10
* | | | Apply suggestions from code reviewRobert Henigan2021-01-211-2/+0
* | | | Apply suggestions from code reviewRobert Henigan2021-01-212-3/+5
* | | | Merge branch 'develop' into feature/issue_871Henigan2021-01-1549-1265/+2564
|\ \ \ \ | |/ / /
| * | | Fix SoftButton delay (#1601)Bilal Alsharifi2021-01-141-5/+5
| * | | Merge pull request #1564 from smartdevicelink/feature/issue_1147Robert Henigan2021-01-143-1/+56
| |\ \ \ | | |/ / | |/| |
| | * | Update base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.javafeature/issue_1147Robert Henigan2021-01-081-1/+2
| | * | Update Unit TestsHenigan2021-01-071-0/+8
| | * | Update RPC VersionHenigan2021-01-071-1/+1
| | * | Add Changes from proposal for CustomPlaybackRateHenigan2020-11-181-0/+46
| | |/
| * | Merge pull request #1595 from smartdevicelink/feature/improve_decoder_compatRobert Henigan2021-01-135-102/+129
| |\ \
| | * | Fix unit testsfeature/improve_decoder_compatBilal Alsharifi2021-01-061-4/+15
| | * | Give NAVIGATION & PROJECTION apps an extra Taskmaster threadBilal Alsharifi2021-01-051-1/+6
| | * | Refactor AudioDecoderCompatBilal Alsharifi2021-01-052-14/+16
| | * | Remove unused AudioDecoderCompat constructorBilal Alsharifi2021-01-051-14/+0
| | * | Use TaskMaster in AudioDecoderCompatBilal Alsharifi2020-12-233-91/+114
| * | | Merge pull request #1581 from LuxoftSDL/feature/0285_constants_tbtBilal Alsharifi2021-01-121-12/+18
| |\ \ \
| | * | | [0285]kboskin2021-01-111-10/+2
| | * | | [0285]kboskin2021-01-113-15/+12
| | * | | [0285]kboskin2021-01-064-65/+66