summaryrefslogtreecommitdiff
path: root/android/sdl_android/src/main
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Deprecate DeviceInfo.DEVICE_OSfeature/deprecate_device_osBilal Alsharifi2020-02-282-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
|/
* Merge pull request #1281 from smartdevicelink/bugfix/issue_1279Julian Kast2020-02-251-3/+5
|\
| * Fix #1279bugfix/issue_1279Joey Grover2020-02-201-3/+5
* | Merge pull request #1271 from smartdevicelink/bugfix/notification_removal_delayBilal Alsharifi2020-02-242-3/+26
|\ \
| * | Increment router service versionbugfix/notification_removal_delayJoey Grover2020-02-112-2/+2
| * | Only add timer if notificaiton should be displayedJoey Grover2020-02-111-1/+2
| * | Delete notification channel when possibleJoey Grover2020-02-111-0/+22
| |/
* | Fixed FIleManager Javadocs for android and JavaSEJulian Kast2020-02-181-3/+3
* | Formatting and moving location of declaring FileManagerConfigJulian Kast2020-02-131-3/+4
* | Formatting FileManager in android and JavaSEJulian Kast2020-02-131-2/+8
* | Changed Location of FileManagerConfigJulian Kast2020-02-131-19/+0
* | Added FileManagerConfigJulian Kast2020-02-103-2/+47
|/
* Merge pull request #1142 from XevoInc/feature/issue-1079Bilal Alsharifi2020-01-304-20/+224
|\
| * 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-222-4/+2
| * Updated the PR based on the feedback at https://github.com/smartdevicelink/sd...Shinichi Watanabe2020-01-202-25/+17
| * 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-0610-91/+339
| |\
| * | Revert "Revert "Merge remote-tracking branch 'upstream/develop' into feature/...Shinichi Watanabe2020-01-0622-282/+439
| * | Revert "Merge remote-tracking branch 'upstream/develop' into feature/issue-1079"Shinichi Watanabe2019-10-0822-439/+282
| * | Merge remote-tracking branch 'upstream/develop' into feature/issue-1079Shinichi Watanabe2019-10-0822-282/+439
| |\ \
| * | | Fix the case where FindRouterTask blocks the caller if ServiceFinder returns ...Shinichi Watanabe2019-09-271-0/+1
| * | | Add timeout to FindRouterTask, and made some cleanups for unused code.Shinichi Watanabe2019-09-251-14/+3
| * | | Merge remote-tracking branch 'upstream/develop' into feature/issue-1079Shinichi Watanabe2019-09-2523-196/+907
| |\ \ \
| * | | | Initial commit for custom RouterService support, which solves issue 1079 at h...Shinichi Watanabe2019-08-024-30/+255
* | | | | Update transitions in VideoStreamManagerfeature/issue_1248Bilal Alsharifi2020-01-161-3/+2
* | | | | Fix potential NPE issue in VideoStreamManagerBilal Alsharifi2020-01-161-1/+1
* | | | | Merge branch 'develop' into feature/issue_1248Bilal Alsharifi2020-01-142-2/+2
|\ \ \ \ \
| * | | | | Fix NPE issue with IsHapticSpatialDataSupported()feature/issue_1245Julian Kast2020-01-072-2/+2
| | |_|_|/ | |/| | |
* | | | | Update the condition for stopping video streamingBilal Alsharifi2020-01-081-1/+1
* | | | | Fix an issue with starting video stream after closing the appBilal Alsharifi2020-01-071-0/+6
|/ / / /
* | | | Update android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo....Bilal Alsharifi2019-11-191-1/+1
* | | | Fix potential overflow issueBilal Alsharifi2019-11-191-2/+2
* | | | Merge pull request #1214 from smartdevicelink/hotfix/issue_1110Bilal Alsharifi2019-11-154-12/+47
|\ \ \ \
| * | | | Fix #1110hotfix/issue_1110Joey Grover2019-11-043-7/+39
| * | | | Fix minor items in StreamPacketizerJoey Grover2019-11-041-5/+8
* | | | | Fix #1225bugfix/issue_1225Joey Grover2019-11-153-34/+79
|/ / / /
* | | | sdl manager crashes when non-mandatory language is nullbugfix/null_languageBrettyWhite2019-10-241-1/+1
* | | | Merge pull request #1196 from smartdevicelink/bugfix/issue_1193Bilal Alsharifi2019-10-111-22/+13
|\ \ \ \
| * | | | Updates for review and test for subcell in clonebugfix/issue_1193Joey Grover2019-10-111-2/+0
| * | | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2019-10-114-14/+182
| |\ \ \ \
| * | | | | Fix issue with image RPC not cloningJoey Grover2019-10-101-2/+6
| * | | | | Fix clone method in SdlArtworkJoey Grover2019-10-091-19/+8
| * | | | | Fix #1193Joey Grover2019-10-091-2/+2
* | | | | | Merge pull request #1192 from smartdevicelink/bugfix/legacy_bt_brBrett2019-10-111-2/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |