summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * Formatting FileManager in android and JavaSEJulian Kast2020-02-132-3/+13
| * Deleting FileMangerConfig form JavaSEJulian Kast2020-02-131-19/+0
| * Changed Location of FileManagerConfigJulian Kast2020-02-132-19/+28
| * Added FileManagerConfig to Java SEJulian Kast2020-02-103-1/+40
| * Added unit testJulian Kast2020-02-101-3/+168
| * Added retry logic for single filesJulian Kast2020-02-101-2/+29
| * Add Retry logic for list of filesJulian Kast2020-02-101-10/+73
| * Added FileManagerConfigJulian Kast2020-02-104-2/+57
|/
* Merge pull request #1265 from smartdevicelink/bugfix/issue_1264Bilal Alsharifi2020-02-041-1/+1
|\
| * update licensebugfix/issue_1264theresalech2020-02-031-1/+1
* | Merge pull request #1107 from smartdevicelink/feature/align_scmJoel Fischer2020-01-313-64/+413
|\ \
| * | Add more tests for SCMfeature/align_scmBilal Alsharifi2020-01-311-8/+137
| * | Update android/sdl_android/src/androidTest/java/com/smartdevicelink/test/prox...Bilal Alsharifi2020-01-311-1/+1
| * | Update android/sdl_android/src/androidTest/java/com/smartdevicelink/test/prox...Bilal Alsharifi2020-01-311-1/+1
| * | Add more tests for SCMBilal Alsharifi2020-01-301-6/+53
| * | Remove duplicate test from SystemCapabilityManagerTestsBilal Alsharifi2020-01-301-15/+2
| * | Clean supportsSubscriptions() methodBilal Alsharifi2020-01-301-2/+2
| * | Update base/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.javaBilal Alsharifi2020-01-301-1/+1
| * | Update base/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.javaBilal Alsharifi2020-01-301-1/+1
| * | Update the conditions in getCapabilityPrivate()Bilal Alsharifi2020-01-231-5/+3
| * | Simplify the conditions is supportsSubscriptions()Bilal Alsharifi2020-01-231-3/+1
| * | Update SCM unit testsBilal Alsharifi2020-01-231-40/+18
| * | Update the new getCapability() method to add forceUpdate paramBilal Alsharifi2020-01-231-23/+31
| * | Update javadoc in SCMBilal Alsharifi2020-01-231-3/+1
| * | Update code formatting in SCMBilal Alsharifi2020-01-231-33/+35
| * | Update deprecated getCapability methods to use the new methodBilal Alsharifi2020-01-231-16/+2
| * | Update javadoc in SCMBilal Alsharifi2020-01-231-3/+5
| * | Add new Version constructorBilal Alsharifi2020-01-222-1/+9
| * | Apply suggestions from code reviewBilal Alsharifi2020-01-221-3/+3
| * | Update adding and removing listeners methods is SCM to support subscriptionsBilal Alsharifi2020-01-171-4/+9
| * | Merge branch 'develop' into feature/align_scmBilal Alsharifi2020-01-172-3/+3
| |\ \
| * | | Add unit tests for the new getCapability() methodBilal Alsharifi2020-01-171-2/+139
| * | | Add getCapability() with subscription ability to SystemCapabilityManagerBilal Alsharifi2020-01-171-8/+58
| * | | Merge branch 'develop' into feature/align_scmBilal Alsharifi2020-01-16322-2558/+15316
| |\ \ \
| * | | | Fix potential NPE in SCMBilal Alsharifi2019-07-111-2/+2
| * | | | Add supportsSubscriptions method to SCMBilal Alsharifi2019-07-111-0/+16
* | | | | Merge pull request #1142 from XevoInc/feature/issue-1079Bilal Alsharifi2020-01-305-21/+258
|\ \ \ \ \
| * | | | | Add setForegroundExceptionHandler to SdlRouterStatusProvider#bindToService as...Shinichi Watanabe2020-01-302-1/+2
| * | | | | Update the PR to meet the feedback at https://github.com/smartdevicelink/sdl_...Shinichi Watanabe2020-01-223-7/+6
| * | | | | Updated the PR based on the feedback at https://github.com/smartdevicelink/sd...Shinichi Watanabe2020-01-203-26/+31
| * | | | | Removed the change to SdlRouterStatusProvider#bindToService, as it was not ap...Shinichi Watanabe2020-01-143-14/+12
| * | | | | Merge remote-tracking branch 'remotes/upstream/develop' into feature/issue-1079Shinichi Watanabe2020-01-06104-859/+3069
| |\ \ \ \ \
| * | | | | | Revert "Revert "Merge remote-tracking branch 'upstream/develop' into feature/...Shinichi Watanabe2020-01-0658-652/+1087
| * | | | | | Revert "Merge remote-tracking branch 'upstream/develop' into feature/issue-1079"Shinichi Watanabe2019-10-0858-1087/+652
| * | | | | | Merge remote-tracking branch 'upstream/develop' into feature/issue-1079Shinichi Watanabe2019-10-0858-652/+1087
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into feature/issue-1079Shinichi Watanabe2019-10-011-1/+2
| |\ \ \ \ \ \ \
| * | | | | | | | Fix the case where FindRouterTask blocks the caller if ServiceFinder returns ...Shinichi Watanabe2019-09-271-0/+1
| * | | | | | | | Merge branch 'feature/issue-1079' of https://github.com/XevoInc/sdl_android i...Shinichi Watanabe2019-09-250-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Ge around the failure in Unit Test (testValidateAsync).Shinichi Watanabe2019-09-251-1/+1
| * | | | | | | | | Get around the failure in Unit Test (testValidateAsync).Shinichi Watanabe2019-09-251-1/+1
| |/ / / / / / / /