summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into bugfix/issue_1331bugfix/issue_1331Bilal Alsharifi2020-04-0913-124/+578
|\
| * Merge pull request #1321 from smartdevicelink/feature/scm_align_part3Bilal Alsharifi2020-04-097-96/+228
| |\
| | * Merge branch 'develop' into feature/scm_align_part3feature/scm_align_part3Bilal Alsharifi2020-04-0818-97/+518
| | |\
| | * | Add use @link Javadoc annotation to ISdl and SCMBilal Alsharifi2020-04-082-0/+4
| | * | Add some null checks to LifecycleManagerBilal Alsharifi2020-04-081-8/+26
| | * | Update android/sdl_android/src/main/java/com/smartdevicelink/managers/video/V...Bilal Alsharifi2020-04-081-1/+1
| | * | Update android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlMana...Bilal Alsharifi2020-04-081-1/+1
| | * | Fix Indentation issues in SCMBilal Alsharifi2020-04-031-76/+76
| | * | Fix Indentation issues in SCMBilal Alsharifi2020-04-031-7/+7
| | * | Fix spacing issue in SCMBilal Alsharifi2020-03-271-5/+5
| | * | Fix SCM unit testsBilal Alsharifi2020-03-271-3/+2
| | * | Mark DISPLAYS as auto subscribed when the SCM is createdBilal Alsharifi2020-03-271-1/+1
| | * | Update VideoStreamManager to avoid querying for capabilities in HMI NONEBilal Alsharifi2020-03-261-1/+3
| | * | Add the new getCapability() method to LifecycleManagerBilal Alsharifi2020-03-261-0/+5
| | * | Add the new getCapability() method to IsdlBilal Alsharifi2020-03-264-0/+32
| | * | Add test to get capability on HMI NONEBilal Alsharifi2020-03-251-15/+29
| | * | Fix broken SCM unit testsBilal Alsharifi2020-03-251-2/+34
| | * | Update SCM to not send GSCR in HMI NONEBilal Alsharifi2020-03-251-0/+21
| | * | Update SCM to avoid force updating if subscribed to capabilityBilal Alsharifi2020-03-251-1/+3
| | * | Update comments in SCMBilal Alsharifi2020-03-251-3/+3
| * | | Merge pull request #1319 from smartdevicelink/bugfix/issue_1316Bilal Alsharifi2020-04-095-14/+349
| |\ \ \ | | |_|/ | |/| |
| | * | Add null check for downloaded imagebugfix/issue_1316RHenigan2020-04-091-1/+6
| | * | Checkout manifest from developRHenigan2020-04-081-2/+2
| | * | PR Changes requestedRHenigan2020-04-082-15/+10
| | * | Fix testRHenigan2020-04-071-3/+2
| | * | Add null checkRHenigan2020-04-071-1/+5
| | * | Adding documentation and PR changesRHenigan2020-04-073-9/+53
| | * | Pull logic into DeviceIconManager and use listenerRHenigan2020-04-035-166/+76
| | * | Updates based on PR feedbackRHenigan2020-04-013-67/+29
| | * | Merge branch 'bugfix/issue_1316' of github.com:smartdevicelink/sdl_java_suite...RHenigan2020-03-310-0/+0
| | |\ \
| | | * | Update android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscr...Robert Henigan2020-03-311-1/+1
| | * | | Fixes from PR ReviewRHenigan2020-03-313-76/+56
| | |/ /
| | * | Replace Logcat with DebugToolRHenigan2020-03-261-17/+11
| | * | Add happy path test for getFileFromCacheRHenigan2020-03-252-7/+52
| | * | Add test for getFileFromCacheRHenigan2020-03-251-2/+23
| | * | Add passing test for saveFileToCacheRHenigan2020-03-251-1/+27
| | * | Continue TestingRHenigan2020-03-253-7/+69
| | * | Handle Edge Cases and initial testsRHenigan2020-03-254-36/+163
| | * | Hash iconUrl and fix minor issuesRHenigan2020-03-243-23/+67
| | * | Update Exceptions and integrate to lockscrnManagerRHenigan2020-03-242-29/+56
| | * | Initial pass at Caching Lock Screen iconRHenigan2020-03-232-1/+91
| | |/
| * | Merge pull request #1330 from smartdevicelink/managerListener_cleanupBilal Alsharifi2020-04-071-13/+0
| |\ \
| | * | removing code that is done in the super onReceiveRHenigan2020-04-071-11/+0
| | * | Remove left over code in hellosdlmanagerListener_cleanupRHenigan2020-04-021-3/+1
* | | | Merge branch 'develop' into bugfix/issue_1331Bilal Alsharifi2020-04-0723-78/+789
|\ \ \ \ | |/ / /
| * | | Merge pull request #1309 from smartdevicelink/bugfix/issue_1289Bilal Alsharifi2020-04-071-8/+9
| |\ \ \
| | * \ \ Merge branch 'develop' into bugfix/issue_1289Bilal Alsharifi2020-04-0723-78/+788
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1314 from smartdevicelink/bugfix/issue_1282Julian Kast2020-04-039-3/+172
| |\ \ \ \
| | * | | | Add null checks for vehicle type and makebugfix/issue_1282RHenigan2020-03-232-4/+9
| | * | | | Update parameter comments for updateRHenigan2020-03-201-0/+1
View Lorry Controller Status