summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix older video stream restartsfeature/old_video_resumeBrettyWhite2019-09-031-0/+3
* Merge pull request #1136 from mrapitis/feature/generic_network_signalBrett2019-08-2924-91/+307
|\
| * Fixed unit test.mrapitis2019-08-291-1/+1
| * Update VehicleDataTypeTests.javaMarkos Rapitis2019-08-291-1/+1
| * Update VehicleDataTypeTests.javaMarkos Rapitis2019-08-291-2/+2
| * Update VehicleDataType.javaMarkos Rapitis2019-08-291-1/+1
| * Update VehicleDataType.javaMarkos Rapitis2019-08-291-35/+37
| * Merge branch 'develop' into feature/generic_network_signalAnil Dahiya2019-08-27103-481/+4553
| |\
| * | Additional update for adding VEHICLEDATA_OEM_VEHICLE_DATA_TYPE in VehicleData...Anil Dahiya2019-07-313-13/+10
| * | Fix some spacing issuesMarkos Rapitis2019-07-291-65/+67
| * | Merge branch 'develop' into feature/generic_network_signalAnil Dahiya2019-07-26141-827/+12121
| |\ \
| * | | Updating test cases for Generic Network Signal data Proposal changes.Anil Dahiya2019-07-2514-7/+79
| * | | Additional changes to method names as per revised proposal.Anil Dahiya2019-07-248-35/+32
| * | | Changes for Reading Generic Network Signal data.Anil Dahiya2019-06-068-11/+155
* | | | Merge pull request #1153 from smartdevicelink/feature/lockscreen_changesBilal Alsharifi2019-08-285-29/+234
|\ \ \ \
| * | | | Simplify if conditions LockScreenManagerBilal Alsharifi2019-08-281-5/+4
| * | | | fix review commentsfeature/lockscreen_changesBrettyWhite2019-08-223-4/+16
| * | | | some of the fixes requestedBrettyWhite2019-08-223-6/+10
| * | | | clarify javadocsBrettyWhite2019-08-201-2/+2
| * | | | merge variable declarationsBrettyWhite2019-08-201-2/+1
| * | | | lock screen changes to match iOSBrettyWhite2019-08-204-26/+217
* | | | | Merge pull request #1108 from smartdevicelink/feature/tcp_transportManagerBrett2019-08-276-36/+233
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Address review commentsJoey Grover2019-08-274-17/+4
| * | | | Add ability to use TCP transport with new layersfeature/tcp_transportManagerJoey Grover2019-07-123-13/+50
| * | | | Make TCP write thread actually not on main threadJoey Grover2019-07-121-23/+56
| * | | | Create TCPTransportManagerJoey Grover2019-07-121-0/+136
| * | | | Add check to WifiSocketFacotry for null contextJoey Grover2019-07-121-0/+4
* | | | | Merge pull request #1122 from mjuarez-ford/feature/issue_0216_widget_supportJoey Grover2019-08-2652-113/+2478
|\ \ \ \ \
| * | | | | Fix error on FunctionIDMauricio Juarez2019-08-221-1/+1
| * | | | | Update predefined window to be a enumMauricio Juarez2019-08-2212-33/+40
| * | | | | Merge branch 'develop' into feature/issue_0216_widget_supportMauricio2019-08-2128-156/+665
| |\ \ \ \ \
| * | | | | | Change to int enumMauricio2019-08-2110-22/+15
| * | | | | | Validation of the manager on the onHMIStatusMauricio2019-08-2110-16/+61
| * | | | | | change to set it as Object as suggestedMauricio2019-08-212-30/+15
| * | | | | | fix tabulation and positionMauricio2019-08-191-32/+35
| * | | | | | Fix documentationMauricio2019-08-1618-52/+55
| * | | | | | Merge branch 'develop' into feature/issue_0216_widget_supportMauricio2019-08-0613-62/+623
| |\ \ \ \ \ \
| * | | | | | | Change the id number for the functionsMauricio2019-08-011-3/+3
| * | | | | | | Fix commentsMauricio2019-08-012-3/+6
| * | | | | | | Merge branch 'develop' into feature/issue_0216_widget_supportMauricio2019-08-0120-119/+338
| |\ \ \ \ \ \ \
| * | | | | | | | Add displays to the SystemCapabilityTypeMauricio2019-08-011-0/+24
| * | | | | | | | Merge branch 'develop' into feature/issue_0216_widget_supportMauricio2019-07-2642-241/+1278
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | add documentationMauricio2019-07-252-0/+11
| * | | | | | | | add documentationMauricio2019-07-251-0/+1
| * | | | | | | | add documentationMauricio2019-07-256-0/+9
| * | | | | | | | Add documentationMauricio2019-07-2316-166/+222
| * | | | | | | | Merge branch 'feature/widget_support' of https://github.com/anildahiya/sdl_an...Mauricio2019-07-2240-11/+2244
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' into feature/widget_supportAnil Dahiya2019-06-1047-375/+4799
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Changes for Widget proposal along with addition of test case for same.Anil Dahiya2019-05-3040-11/+2240
* | | | | | | | | | | Merge pull request #1119 from skibyte/0179_PixelDensityAndScale_v1Brett2019-08-2110-22/+435
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |