summaryrefslogtreecommitdiff
path: root/android/sdl_android/src/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into bugfix/issue_1331bugfix/issue_1331Bilal Alsharifi2020-04-095-15/+257
|\
| * Merge pull request #1321 from smartdevicelink/feature/scm_align_part3Bilal Alsharifi2020-04-093-1/+19
| |\
| | * Merge branch 'develop' into feature/scm_align_part3feature/scm_align_part3Bilal Alsharifi2020-04-086-58/+139
| | |\
| | * | 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
| | * | Update VideoStreamManager to avoid querying for capabilities in HMI NONEBilal Alsharifi2020-03-261-1/+3
| | * | Add the new getCapability() method to IsdlBilal Alsharifi2020-03-262-0/+16
| * | | Merge pull request #1319 from smartdevicelink/bugfix/issue_1316Bilal Alsharifi2020-04-092-13/+237
| |\ \ \ | | |_|/ | |/| |
| | * | Add null check for downloaded imagebugfix/issue_1316RHenigan2020-04-091-1/+6
| | * | PR Changes requestedRHenigan2020-04-081-13/+9
| | * | Add null checkRHenigan2020-04-071-1/+5
| | * | Adding documentation and PR changesRHenigan2020-04-072-8/+52
| | * | Pull logic into DeviceIconManager and use listenerRHenigan2020-04-032-25/+51
| | * | Updates based on PR feedbackRHenigan2020-04-012-23/+16
| | * | Fixes from PR ReviewRHenigan2020-03-312-63/+34
| | * | Replace Logcat with DebugToolRHenigan2020-03-261-17/+11
| | * | Add happy path test for getFileFromCacheRHenigan2020-03-251-1/+1
| | * | Continue TestingRHenigan2020-03-251-0/+1
| | * | Handle Edge Cases and initial testsRHenigan2020-03-252-36/+68
| | * | Hash iconUrl and fix minor issuesRHenigan2020-03-242-23/+66
| | * | Update Exceptions and integrate to lockscrnManagerRHenigan2020-03-242-29/+56
| | * | Initial pass at Caching Lock Screen iconRHenigan2020-03-231-0/+88
| | |/
* | | Merge branch 'develop' into bugfix/issue_1331Bilal Alsharifi2020-04-076-51/+164
|\ \ \ | |/ /
| * | Merge branch 'develop' into bugfix/issue_1289Bilal Alsharifi2020-04-076-51/+163
| |\ \
| | * \ Merge pull request #1314 from smartdevicelink/bugfix/issue_1282Julian Kast2020-04-033-3/+17
| | |\ \
| | | * | Add null checks for vehicle type and makebugfix/issue_1282RHenigan2020-03-231-2/+5
| | | * | Scale Workaround for High Res Ford/Linc displaysRHenigan2020-03-193-3/+14
| | * | | Merge pull request #1311 from smartdevicelink/bugfix/router_service_notificationBilal Alsharifi2020-04-031-16/+12
| | |\ \ \
| | | * | | Update logic after more testingbugfix/router_service_notificationJoey Grover2020-03-191-2/+6
| | | * | | Add missing return satement in rs_notif timeoutJoey Grover2020-03-171-0/+1
| | | * | | Refactor exitForeground logicJoey Grover2020-03-171-16/+7
| | | |/ /
| | * | | Remove extra spacing from SdlFile javadocfeature/Image_upload_managementBilal Alsharifi2020-03-201-3/+0
| | * | | Merge branch 'develop' into feature/Image_upload_managementBilal Alsharifi2020-03-201-0/+36
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Removing check primitive vars for null in SdlFile in android projectJulian Kast2020-03-131-3/+3
| | | * | Added custom equals and hashcode method to SdlFileJulian Kast2020-03-121-0/+33
| | | |/
| | * | Merge branch 'develop' into feature/Image_upload_managementBilal Alsharifi2020-03-119-20/+96
| | |\ \ | | | |/
| | * | Generate name for SdlFile if not provided by dev (javaSE)Bilal Alsharifi2020-02-041-7/+7
| | * | Generate name for SdlFile if not provided by devBilal Alsharifi2020-02-042-31/+101
* | | | Update VideoStreamManager to use VideoStreamingStateBilal Alsharifi2020-04-061-17/+17
|/ / /
* | | Removed unused importbugfix/issue_1289Julian Kast2020-03-241-1/+0
* | | Removed nonStreamableLevels list form videoStreamManager and changed it usage...Julian Kast2020-03-241-5/+4
* | | In VideoStreamManager, Added two list to hold hmi LevelsJulian Kast2020-03-241-6/+10
* | | Fixed error message in videoSteamManangerJulian Kast2020-03-241-1/+1
* | | Merge branch 'develop' into bugfix/issue_1289Julian Kast2020-03-162-9/+27
|\ \ \ | | |/ | |/|
| * | changed isOverwrite to getOverwrite in sdlFIle in both projects and BaseFileM...add_Overwrite_PropertyJulian Kast2020-03-111-1/+1
| * | Merge branch 'develop' into add_Overwrite_PropertyJulian Kast2020-03-102-2/+2
| |\ \
| * | | Since overwrite is set to true by default, I removed it form constructors and...Julian Kast2020-03-052-11/+3
| * | | Added a call in SdlArtwork default constructor to call Super empty construct...Julian Kast2020-03-041-1/+3
| * | | Added overwrite property to SdlFileJulian Kast2020-03-041-8/+32
* | | | Added checks to make video streaming to be started in hmiLevel LIMITEDJulian Kast2020-03-161-2/+2
View Lorry Controller Status