summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release/RC_5.0.0' into feature/lockscreen_ui_testingfeature/lockscreen_ui_testingHenigan2020-10-1228-768/+876
|\
| * Update version to RC2_5.0.0RC2_5.0.0Bilal Alsharifi2020-10-083-3/+3
| * Merge pull request #1524 from smartdevicelink/feature/5.0_release_notesRobert Henigan2020-10-071-29/+79
| |\
| | * Update formatting in CHANGELOG.mdfeature/5.0_release_notesBilal Alsharifi2020-10-071-5/+4
| | * Add 5.0.0 release notesBilal Alsharifi2020-10-071-25/+76
| |/
| * Pull latest rpc_spec changesBilal Alsharifi2020-10-071-0/+0
| * Merge pull request #1517 from smartdevicelink/bugfix/issue_1515Robert Henigan2020-10-053-121/+165
| |\
| | * Correct conditional logicbugfix/issue_1515Joey Grover2020-10-051-1/+1
| | * Fix logic handling for dismiss “null” case paramJoey Grover2020-10-051-2/+6
| | * Refactor lockscreen acitivity and DD codeJoey Grover2020-10-022-81/+96
| | * Add another case for updating lockscreenJoey Grover2020-10-011-0/+4
| | * Fix check in dismissable change for lockscreenJoey Grover2020-10-011-1/+1
| | * Combine bools for lockscreen dismiss extraJoey Grover2020-10-011-1/+1
| | * Fix lockscreen testsJoey Grover2020-09-301-2/+2
| | * Fix case launching lockscreen too many timesJoey Grover2020-09-302-26/+33
| | * Prevent multiple startActivity calls for same intentJoey Grover2020-09-301-27/+41
| * | Merge pull request #1522 from smartdevicelink/feature/reformat_hello_sdl_codeRobert Henigan2020-10-0513-554/+559
| |\ \
| | * | Fix formatting isssue in AndroidManifest.xmlfeature/reformat_hello_sdl_codeBilal Alsharifi2020-10-021-1/+2
| | * | Reformat hello sdl javaEE codeBilal Alsharifi2020-10-022-47/+48
| | * | Reformat hello sdl javaSE codeBilal Alsharifi2020-10-022-45/+45
| | * | Reformat hello sdl android codeBilal Alsharifi2020-10-029-464/+467
| |/ /
| * | Merge pull request #1521 from smartdevicelink/bugfix/fix_on_service_error_logRobert Henigan2020-10-022-2/+2
| |\ \
| | * | Fix onServiceError message in SdlSessionbugfix/fix_on_service_error_logBilal Alsharifi2020-10-012-2/+2
| |/ /
| * | Merge pull request #1519 from smartdevicelink/bugfix/restart_taskmasterJulian Kast2020-10-011-0/+5
| |\ \
| | * | Reset taskmaster on clean()bugfix/restart_taskmasterBilal Alsharifi2020-10-011-0/+5
| |/ /
| * | Merge pull request #1516 from smartdevicelink/bugfix/backup_transport_fixJulian Kast2020-10-011-3/+1
| |\ \ | | |/ | |/|
| | * Fix an issue in switching to backup transport when first transport gets disco...bugfix/backup_transport_fixBilal Alsharifi2020-09-301-3/+1
| * | Merge pull request #1514 from smartdevicelink/feature/issue_1513Robert Henigan2020-09-241-0/+2
| |\ \
| | * | Set user agent in downloadFile()feature/issue_1513Bilal Alsharifi2020-09-241-0/+2
| | |/
| * | Merge pull request #1507 from smartdevicelink/feature/fix_todo_stripJulian Kast2020-09-211-2/+2
| |\ \
| | * | Fix todo in generatorfeature/fix_todo_stripBilal Alsharifi2020-09-181-2/+2
| * | | Update versionCode to 15Bilal Alsharifi2020-09-211-1/+1
| * | | Update version to RC_5.0.0Bilal Alsharifi2020-09-212-31/+31
| * | | Use develop branch for rpc_spec submoduleBilal Alsharifi2020-09-212-1/+1
| | |/ | |/|
* | | Add LockScreen UI testsHenigan2020-10-124-4/+268
|/ /
* | Merge pull request #1510 from smartdevicelink/feature/bson_RC1_1.2.2Robert Henigan2020-09-211-1/+1
|\ \
| * | Update BSON to RC1_1.2.2feature/bson_RC1_1.2.2Bilal Alsharifi2020-09-211-1/+1
* | | Merge pull request #1509 from smartdevicelink/bugfix/fix_method_naming_testsRobert Henigan2020-09-212-6/+6
|\ \ \ | |/ / |/| |
| * | Remove underscores in test method namesbugfix/fix_method_naming_testsJoey Grover2020-09-212-6/+6
|/ /
* | Merge pull request #1508 from smartdevicelink/feature/hmi_capabilities_fixRobert Henigan2020-09-213-4/+6
|\ \
| * | Fix unit testsfeature/hmi_capabilities_fixBilal Alsharifi2020-09-211-0/+2
| * | Update HMICapabilities APIs namesBilal Alsharifi2020-09-212-4/+4
|/ /
* | Merge pull request #1505 from smartdevicelink/feature/code_formattingRobert Henigan2020-09-211102-76645/+78770
|\ \
| * | Reformat RTPH264Packetizer & StreamPacketizerBilal Alsharifi2020-09-212-666/+659
| * | Merge branch 'develop' into feature/code_formattingBilal Alsharifi2020-09-212-642/+667
| |\ \ | |/ / |/| |
* | | Merge pull request #1480 from smartdevicelink/bugfix/issue_1398Julian Kast2020-09-212-2/+20
|\ \ \ | |_|/ |/| |
| * | Fix potential deadlock in media streaming classesbugfix/issue_1398Joey Grover2020-09-022-2/+20
| | * Fix fomratting per code reviewfeature/code_formattingBilal Alsharifi2020-09-182-78/+20
| | * Remove extra semicolonsBilal Alsharifi2020-09-182-3/+0
| | * Remove extra semicolonBilal Alsharifi2020-09-181-1/+0