summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor RPC Encryption APIs to match iOSBilal Alsharifi2019-10-018-45/+40
* Merge branch 'develop' into rpcMsgProtection2Bilal Alsharifi2019-10-0111-9/+85
|\
| * Merge pull request #1182 from smartdevicelink/feature/service_listener_fixBrett2019-09-271-1/+2
| |\
| | * Fix ISdlServiceListener callbackBilal Alsharifi2019-09-271-1/+2
| |/
| * Merge pull request #1173 from smartdevicelink/feature/mandatory_paramsBilal Alsharifi2019-09-1610-8/+83
| |\
| | * add in non-null to settersfeature/mandatory_paramsBrettyWhite2019-09-165-7/+7
| | * tests and docsBrettyWhite2019-09-169-0/+44
| | * add in missing helper constructorsBrettyWhite2019-09-165-1/+32
| |/
* | 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
|\ \ | |/
| * Merge pull request #1161 from smartdevicelink/bugfix/resume_secondary_transportBilal Alsharifi2019-09-133-10/+57
| |\
| | * Merge branch 'develop' into bugfix/resume_secondary_transportbugfix/resume_secondary_transportBilal Alsharifi2019-09-121-6/+5
| | |\ | | |/ | |/|
| * | Merge pull request #1165 from smartdevicelink/bugfix/video_stream_isStreaming...Bilal Alsharifi2019-09-121-6/+5
| |\ \
| | * | fix is paused logicBrettyWhite2019-09-121-6/+5
| | * | fix incorrect method logicbugfix/video_stream_isStreaming_fixBrettyWhite2019-09-051-1/+1
| | | * Merge branch 'develop' into bugfix/resume_secondary_transportBilal Alsharifi2019-09-1287-377/+3583
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #1169 from smartdevicelink/display_layout_fixBilal Alsharifi2019-09-124-68/+66
| |\ \ \
| | * | | remove deprecation and add javadocdisplay_layout_fixBrettyWhite2019-09-104-68/+66
| * | | | Merge pull request #1156 from smartdevicelink/feature/cancel_interaction_RPCBilal Alsharifi2019-09-1235-224/+1781
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make ChoiceSetManager operations blocking (#1155)feature/cancel_interaction_RPCBilal Alsharifi2019-09-1210-140/+348
| | * | | Removed unused codeNicoleYarroch2019-08-211-5/+0
| | * | | Refactored Thread.currentThread().isInterrupted()NicoleYarroch2019-08-213-9/+19
| | * | | Removed uneeded deprecated presentKeyboard()NicoleYarroch2019-08-213-15/+4
| | * | | dismissKeyboard() now takes a nonnull IntegerNicoleYarroch2019-08-212-2/+2
| | * | | Merge branch 'feature/issue_840_cancel_interaction_RPC' of https://github.com...NicoleYarroch2019-08-212-4/+4
| | |\ \ \
| | | * | | Update base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseC...NicoleYarroch2019-08-211-1/+1
| | | * | | Update base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseC...NicoleYarroch2019-08-211-1/+1
| | | * | | Update base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseC...NicoleYarroch2019-08-211-1/+1
| | | * | | Update base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.javaNicoleYarroch2019-08-211-1/+1
| | * | | | Attempting to fix spacing issue in testsNicoleYarroch2019-08-212-2/+2
| | * | | | Fixed documentationNicoleYarroch2019-08-211-1/+1
| | |/ / /
| | * | | Added constructor to Cancel Interaction ResponseNicoleYarroch2019-08-211-0/+14
| | * | | Refactored true/false checks in test casesNicoleYarroch2019-08-143-52/+23
| | * | | `presentKeyboard` no longer deprecatedNicoleYarroch2019-08-141-12/+1
| | * | | Added nullable to `presentKeyboard()` return valueNicoleYarroch2019-08-143-3/+3
| | * | | Fixed spacingNicoleYarroch2019-08-141-0/+1
| | * | | Removed unused importsNicoleYarroch2019-08-141-4/+0
| | * | | Added check for canceled threads.NicoleYarroch2019-08-146-34/+109
| | * | | Keyboard now cancels with `cancelID`NicoleYarroch2019-08-136-69/+160
| | * | | Refactored cancelID, added spec version checkNicoleYarroch2019-08-126-17/+60
| | * | | Refactored the dismiss keyboard methodsNicoleYarroch2019-08-122-17/+28
| | * | | Test cases added for dismissing keyboard w managerNicoleYarroch2019-08-122-3/+21
| | * | | Added cancel id documentation to modal viewsNicoleYarroch2019-08-084-4/+11
| | * | | Added cancel interaction to SdlProxyBaseNicoleYarroch2019-08-081-0/+16
| | * | | Fix for SdlProxyBaseNicoleYarroch2019-08-081-8354/+8354
| | * | | Fixing SdlProxyBase merge conflictNicoleYarroch2019-08-081-1553/+1537
| | * | | Renamed cancel keyboard methodNicoleYarroch2019-08-074-9/+7
| | * | | Removed unused imports from testNicoleYarroch2019-08-073-3/+1
| | * | | Merge branch 'develop' into feature/issue_840_cancel_interaction_RPCNicoleYarroch2019-08-0729-8550/+9308
| | |\ \ \
View Lorry Controller Status