summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added a return statement after null check in TransportBrokerbugfix/issue_363Joey Grover2016-11-101-0/+1
* Merge branch 'hotfix/issue_357' of https://github.com/smartdevicelink/sdl_and...release/4.2.0-rc1Joey Grover2016-11-102-48/+69
|\
| * Added check for trusted router list during SDL enabled broadcast receivedhotfix/issue_357Joey Grover2016-11-011-11/+20
| * Remove code that stopped self untrusted router serviceJoey Grover2016-11-011-7/+0
| * Added check for trusted router list during check for conencted router servicesJoey Grover2016-11-012-30/+50
* | Merge pull request #354 from smartdevicelink/bugfix/issue_353Joey Grover2016-11-104-4/+48
|\ \
| * | Add protection against incorrect implementations of SdlRouterServicebugfix/issue_353Joey Grover2016-10-274-4/+48
| |/
* | Merge pull request #362 from smartdevicelink/bugfix/issue_361Joey Grover2016-11-101-2/+1
|\ \
| * | Fix #361bugfix/issue_361Joey Grover2016-11-081-2/+1
|/ /
* | Merge pull request #360 from smartdevicelink/feature/sdl_icon_updateJoey Grover2016-11-0712-3/+10
|\ \
| * | Update large notification icon to newer logofeature/sdl_icon_updateJoey Grover2016-11-037-2/+2
| * | Add new icon for notificaiton trayJoey Grover2016-11-026-1/+8
* | | Merge pull request #337 from smartdevicelink/feature/aoa_improvementsJoey Grover2016-11-073-15/+27
|\ \ \
| * | | Revert manifest min to API level 8feature/aoa_improvementsJoey Grover2016-11-041-3/+1
| * | | Remove HelloSdl artifactJoey Grover2016-10-101-7/+0
| * | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2016-10-072-8/+11
| |\ \ \
| * \ \ \ Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2016-09-30224-2328/+7954
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2016-06-1423-128/+450
| |\ \ \ \ \
| * | | | | | Made it possible to use AOA without having app up and running.Joey Grover2016-05-196-26/+75
* | | | | | | Merge pull request #348 from smartdevicelink/bugfix/#338Joey Grover2016-11-031-3/+13
|\ \ \ \ \ \ \
| * | | | | | | Adding a flag to MultiplexBluetoothTransport to keep server socket alive post...bugfix/#338Joey Grover2016-10-241-3/+13
* | | | | | | | Merge pull request #356 from smartdevicelink/bugfix/issue_355Joey Grover2016-11-031-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Set the HttpRequestTask callback to null after a single callbackbugfix/issue_355Joey Grover2016-10-271-1/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'feature/sendlocation_updates' of https://github.com/smartdevice...Joey Grover2016-11-014-2/+459
|\ \ \ \ \ \ \
| * | | | | | | Additional minor update to javadoc comment.feature/sendlocation_updatesAnil Dahiya2016-11-011-1/+1
| * | | | | | | Added javadoc comments, updated style of DeliveryMode enum.Markos Rapitis2016-10-313-6/+248
| * | | | | | | Updation of SendLocation RPC with additional params. Also, addition of new RP...Anil Dahiya2016-10-184-0/+347
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #346 from smartdevicelink/feature/last_mile_navigationJoey Grover2016-11-0115-12/+653
|\ \ \ \ \ \ \
| * | | | | | | Changes for having lat and long in Coordinate as Float instead of Double.feature/last_mile_navigationAnil Dahiya2016-10-252-18/+47
| * | | | | | | Additional minor change to WayPointType Enum.Anil Dahiya2016-10-211-1/+2
| * | | | | | | Changes for adding additional RPC's GetWayPoints, SubscribeWayPoints, Unsubsc...Anil Dahiya2016-10-1814-0/+611
| |/ / / / / /
* | | | | | | Merge pull request #351 from smartdevicelink/bugfix/issue_350Joey Grover2016-11-011-7/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fixed #350bugfix/issue_350Joey Grover2016-10-261-7/+6
|/ / / / / /
* | | | | | Merge pull request #340 from smartdevicelink/bugfix/issue_339Joey Grover2016-10-251-16/+45
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Decress timeout for version checkbugfix/issue_339Joey Grover2016-10-131-1/+1
| * | | | | Added a list of known apps to wait for versions from and increased timeoutJoey Grover2016-10-121-16/+45
| |/ / / /
* | | | | Merge pull request #240 from smartdevicelink/feature/unit_testsJoey Grover2016-10-19304-47/+29615
|\ \ \ \ \
| * \ \ \ \ Merge branch 'feature/unit_tests_security' of https://github.com/smartdevicel...feature/unit_testsJoey Grover2016-10-075-11/+260
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into feature/unit_tests_securityfeature/unit_tests_securityAnil Dahiya2016-08-028-77/+240
| | |\ \ \ \ \
| | * | | | | | Updating method for checking payload protected to isPayloadProtected instead ...Anil Dahiya2016-08-027-31/+187
| | * | | | | | Merge branch 'feature/external_security_support' into feature/unit_testsAnil Dahiya2016-07-2850-1453/+1624
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2016-10-0756-1707/+2124
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Added more test to check proper storage of prefs/app listJoey Grover2016-07-271-0/+26
| * | | | | | | Adding a few multiplexing testsJoey Grover2016-06-295-0/+538
| * | | | | | | Converted to Android JUnit tests and fixed some outdated tests.Joey Grover2016-06-29121-104/+141
| * | | | | | | Fixed merge issues and added a helper class for null valuesJoey Grover2016-06-2814-568/+35
| * | | | | | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2016-06-28274-2745/+16463
| |\ \ \ \ \ \ \
| * | | | | | | | Fix class naming issueJoey Grover2016-06-283-3/+3
| * | | | | | | | More merge test adjustments.Mikayla Ray2015-06-106-10/+13
| * | | | | | | | Post merge test adjustments.Mikayla Ray2015-06-1012-111/+223