Commit 5f4c890
committed
Merge branch 'develop' into feature/Image_upload_management
# Conflicts:
# android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
# javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java51 files changed
Lines changed: 2409 additions & 360 deletions
File tree
- .github/workflows
- android/sdl_android/src
- androidTest/java/com/smartdevicelink
- managers
- file
- lifecycle
- test
- proxy
- rpc/enums
- main
- java/com/smartdevicelink
- managers
- file
- filetypes
- proxy
- transport
- res/values
- base/src/main/java/com/smartdevicelink
- managers
- file
- protocol/enums
- proxy
- rpc
- enums
- util
- javaSE/src/main/java/com/smartdevicelink/managers
- file
- filetypes
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
| 38 | + | |
39 | 39 | | |
40 | | - | |
41 | 40 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
0 commit comments