summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix issue with choice set manager and static imagesfeature/choice_set_static_iconsBilal Alsharifi2019-10-101-2/+2
* Fix potential NPE in PreloadChoicesOperationBilal Alsharifi2019-10-101-1/+1
* Merge pull request #1188 from smartdevicelink/feature/SDL-0243-DisplayCapBilal Alsharifi2019-10-1045-288/+557
|\
| * Merge branch 'develop' into feature/SDL-0243-DisplayCapBilal Alsharifi2019-10-1031-211/+886
| |\ | |/ |/|
* | Merge pull request #1187 from smartdevicelink/feature/issue_978Brett2019-10-1021-122/+737
|\ \
| * | prevent security from initializing twice in sdlsessionfeature/issue_978BrettyWhite2019-10-092-3/+6
| * | fix some review commentsBrettyWhite2019-10-092-4/+4
| * | Call sdlSecurity.initialize() only when the first encrypted service startsBilal Alsharifi2019-10-041-2/+6
| * | Add service listener for audio and video servicesBilal Alsharifi2019-10-041-0/+3
| * | Deprecate LifecycleManager.setSdlSecurityClassList()Bilal Alsharifi2019-10-031-0/+5
| * | Merge branch 'develop' into feature/issue_978Bilal Alsharifi2019-10-0342-463/+731
| |\ \
| * | | Update javadoc for encryption apisBilal Alsharifi2019-10-028-58/+49
| * | | Remove some unused codeBilal Alsharifi2019-10-025-43/+40
| * | | implement startRPCEncryption() in ISdlBilal Alsharifi2019-10-021-0/+2
| * | | Update spacingBilal Alsharifi2019-10-022-15/+12
| * | | Merge branch 'develop' into feature/issue_978Bilal Alsharifi2019-10-027-62/+167
| |\ \ \
| * | | | Restructure BaseEncryptionLifecycleManagerBilal Alsharifi2019-10-026-349/+352
| * | | | Remove EncryptionCallbackBilal Alsharifi2019-10-024-27/+38
| * | | | Refactor RPC Encryption APIs to match iOSBilal Alsharifi2019-10-018-45/+40
| * | | | Merge branch 'develop' into rpcMsgProtection2Bilal Alsharifi2019-10-0111-9/+85
| |\ \ \ \
| * | | | | Move app level check to outside of loop.Tuan Nguyen2019-09-131-6/+6
| * | | | | - Add null check to encryption callbackTuan Nguyen2019-09-132-14/+14
| * | | | | Merge branch 'develop_mainRepo_local' into rpcMsgProtection2Tuan Nguyen2019-09-1342-308/+1909
| |\ \ \ \ \
| * | | | | | Remove local rpc set and use instance variable instead in BasePermissionManagerTuan Nguyen2019-09-131-2/+2
| * | | | | | Remove HMI level check for getRequireEncryption methodTuan Nguyen2019-09-131-1/+1
| * | | | | | Remove HMI level check for getRequireEncryption methodTuan Nguyen2019-09-131-1/+1
| * | | | | | Fix symbolic link for ServiceEncryptionListener.Tuan Nguyen2019-09-121-1/+1
| * | | | | | - Move ServiceEncryptionListener to base directoryTuan Nguyen2019-09-115-53/+49
| * | | | | | Perform null check on encryption callback object in case the started service ...Tuan Nguyen2019-09-111-3/+11
| * | | | | | Perform null check before making onError call back, also have the method retu...Tuan Nguyen2019-09-101-1/+9
| * | | | | | When an encrypted message that is an RPCRequest is sent and there is no secur...Tuan Nguyen2019-09-101-9/+0
| * | | | | | - Deprecated setSdlSecurity method in SdlManager and provide setSdlSecurity w...Tuan Nguyen2019-09-104-6/+72
| * | | | | | Merge branch 'develop_mainRepo_local' into rpcMsgProtection2Tuan Nguyen2019-09-1050-83/+1733
| |\ \ \ \ \ \
| * | | | | | | - Match PermissionItem's method names with OnPermissionChangeTuan Nguyen2019-09-096-9/+48
| * | | | | | | Merge branch 'develop_mainRepo_local' into rpcMsgProtection2Tuan Nguyen2019-09-0937-158/+777
| |\ \ \ \ \ \ \
| * | | | | | | | Assign weak ref of encryption manager to lifecycle managerTuan Nguyen2019-08-295-38/+148
| * | | | | | | | Add EncryptionManager as a subclass of BaseEncryptionManagerTuan Nguyen2019-08-273-6/+25
| * | | | | | | | Also listen to HMI status in encryption managerTuan Nguyen2019-08-272-28/+87
| * | | | | | | | Merge branch 'develop_mainRepo' into rpcMsgProtection2Tuan Nguyen2019-08-26190-859/+11803
| |\ \ \ \ \ \ \ \
| * | | | | | | | | JavaSE, first batchTuan Nguyen2019-08-233-3/+165
| * | | | | | | | | Make an onError callback if an encrypted message is sent and there is not a s...Tuan Nguyen2019-08-152-0/+16
| * | | | | | | | | Fix per code review recommendations:Tuan Nguyen2019-08-085-9/+36
| * | | | | | | | | Change Log to less verboseTuan Nguyen2019-07-241-3/+3
| * | | | | | | | | Attempt to remove default tab.Tuan Nguyen2019-07-241-1/+1
| * | | | | | | | | Fix per reviewer's recommendation, remove spaceTuan Nguyen2019-07-241-1/+1
| * | | | | | | | | Add more tests for PermissionItemTestTuan Nguyen2019-07-231-0/+7
| * | | | | | | | | Add more tests to new field in PermissionItemTestTuan Nguyen2019-07-233-1/+7
| * | | | | | | | | Make changes as per code reviewTuan Nguyen2019-07-231-11/+12
| * | | | | | | | | Put back previous callback to notify that a secured service has been started.Tuan Nguyen2019-07-161-5/+4
| * | | | | | | | | Fix failed build: add "ENCRYPTION_NEEDED" to Enum test list in ResultTests.javaTuan Nguyen2019-07-161-0/+1