summaryrefslogtreecommitdiff
path: root/base
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into bugfix/issue_1377_HttpRequestTaskRHenigan2020-06-125-43/+2207
|\
| * Update formattingfeature/android_lcmBilal Alsharifi2020-06-112-215/+303
| * Add cycle proxy logic to LCMBilal Alsharifi2020-06-092-26/+23
| * add createSession method to LCMBilal Alsharifi2020-06-081-2/+6
| * Remove deprecated methods usage in SdlManagerBilal Alsharifi2020-06-051-4/+4
| * Add logic to set SdlSecurityBase.contextBilal Alsharifi2020-06-052-2/+4
| * Update getProtocolVersion() to return default version if value is nullBilal Alsharifi2020-06-041-3/+3
| * Prevent sending RPC with protected CorrelationIDBilal Alsharifi2020-06-043-15/+35
| * Remove old checkLifecycleConfiguration methodBilal Alsharifi2020-06-041-54/+0
| * Merge branch 'develop' into feature/android_lcmBilal Alsharifi2020-06-041-1/+72
| |\
| * | Update formattingBilal Alsharifi2020-06-032-11/+11
| * | Remove unused importsBilal Alsharifi2020-06-031-5/+0
| * | Move NAV & PCM code to Android LifecycleManagerBilal Alsharifi2020-06-031-311/+52
| * | Cleanup LCMBilal Alsharifi2020-06-031-3/+1
| * | Merge branch 'develop' into feature/android_lcmBilal Alsharifi2020-06-021-1/+5
| |\ \
| * | | Add basic NAV & PCM support to BaseLifecycleManagerBilal Alsharifi2020-06-021-10/+295
| * | | Merge branch 'develop' into feature/android_lcmBilal Alsharifi2020-06-021-1/+2
| |\ \ \
| * | | | Add NAV & PCM dupport to EncryptionLifecycleManagerBilal Alsharifi2020-06-021-1/+2
| * | | | Update code formattingBilal Alsharifi2020-05-292-76/+46
| * | | | Merge branch 'develop' into feature/android_lcmBilal Alsharifi2020-05-295-6/+42
| |\ \ \ \
| * | | | | Setup Android SdlManager to use LifecycleManagerBilal Alsharifi2020-05-291-21/+626
| * | | | | Add Android LifecycleManager constructorBilal Alsharifi2020-05-281-1/+1
| * | | | | Move constructor from BaseLifecycleManager to LifecycleManagerBilal Alsharifi2020-05-281-30/+13
| * | | | | Move code from LifecycleManager to BaseLifecycleManagerBilal Alsharifi2020-05-281-0/+1461
* | | | | | Deprecate AsynctaskRHenigan2020-06-111-0/+1
* | | | | | Add AsyncTask back and deprecateRHenigan2020-06-111-0/+26
* | | | | | Move HttpRequestTask to android and JavaSE foldersRHenigan2020-06-102-237/+0
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #1325 from zhouxin627/bugfix/1241Julian Kast2020-06-031-0/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | hmiDisplayLanguage and vr/tts language set separatelyhannianqiao2020-01-161-0/+3
* | | | | Merge pull request #1354 from smartdevicelink/bugfix/issue_1341Julian Kast2020-06-021-1/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix Logic and Add TestRHenigan2020-05-281-1/+1
| * | | | Move logic to BaseMenuManagerRHenigan2020-05-282-6/+6
| * | | | Check menucells vr list to see if null or emptyRHenigan2020-05-181-1/+5
* | | | | Merge pull request #1364 from smartdevicelink/documentation/permissionManager...Julian Kast2020-06-021-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update javadocs for PermissionManager.addListenerdocumentation/permissionManager_addListenerRHenigan2020-05-281-1/+2
| | |_|/ | |/| |
* | | | Merge pull request #1356 from smartdevicelink/bugfix/issue_1335Julian Kast2020-05-295-6/+42
|\ \ \ \ | |/ / / |/| | |
| * | | Add Javadocs change max row numberbugfix/issue_1335RHenigan2020-05-291-1/+11
| * | | fix unnecessary changeRHenigan2020-05-261-2/+1
| * | | Fix max lineRHenigan2020-05-261-1/+1
| * | | Add utility to support all Image and Text TypesRHenigan2020-05-202-12/+28
| * | | Update null checks for the Base ManagersRHenigan2020-05-203-5/+5
| * | | Add null fix to SCM for imagefields and text fieldsRHenigan2020-05-191-2/+13
* | | | Merge remote-tracking branch 'upstream/develop' into feature/issue-1132Shinichi Watanabe2020-05-2825-241/+315
|\ \ \ \
| * \ \ \ Merge pull request #1363 from smartdevicelink/feature/issue_1362Bilal Alsharifi2020-05-2715-208/+238
| |\ \ \ \
| | * | | | Update base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.javafeature/issue_1362Bilal Alsharifi2020-05-271-2/+2
| | * | | | Fix rpcs param type in Isdl.sendRPCs()Bilal Alsharifi2020-05-271-1/+1
| | * | | | Deprecate some callbacks in ISdlBilal Alsharifi2020-05-261-0/+15
| | * | | | Deprecate SdlConnectionStateBilal Alsharifi2020-05-221-6/+7
| | * | | | Deprecate APIs to prepare for next major changeBilal Alsharifi2020-05-2213-202/+216
| | |/ / /
| * | | | Add toString() to PermissionStatusBilal Alsharifi2020-05-191-0/+5
View Lorry Controller Status