Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Hotfix/mtu size for v3 & v4 protocols"revert-275-hotfix/mtu | Joey Grover | 2016-01-19 | 1 | -2/+2 |
| | |||||
* | Merge pull request #275 from smartdevicelink/hotfix/mtu | Joey Grover | 2016-01-19 | 1 | -2/+2 |
|\ | | | | | Hotfix/mtu size for v3 & v4 protocols | ||||
| * | Adjusted mtu sizes to match value on core side. (131072 - 12 = 131060) | Markos Rapitis | 2015-12-14 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'develop'4.0.0 | Joey Grover | 2015-09-15 | 173 | -1737/+3493 |
|\ | |||||
| * | Merge pull request #262 from smartdevicelink/release/4.0.0-rc | Joey Grover | 2015-09-15 | 1 | -0/+79 |
| |\ | | | | | | | Added change log for v4 | ||||
| | * | Added change log for v4release/4.0.0-rc | Joey Grover | 2015-09-15 | 1 | -0/+79 |
| |/ | |||||
| * | Merge branch 'feature/sdl-proxy-builder' of ↵ | Joey Grover | 2015-09-14 | 1 | -0/+129 |
| |\ | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop | ||||
| | * | Refactored ngnAppName to become shortAppName | Markos Rapitis | 2015-08-28 | 1 | -6/+6 |
| | | | |||||
| | * | Updated names to match conventions. | Markos Rapitis | 2015-08-24 | 1 | -15/+15 |
| | | | |||||
| | * | Added SdlProxyBuilder class. | Markos Rapitis | 2015-08-24 | 1 | -0/+129 |
| | | | |||||
| * | | Merge branch 'hotfix/usb_metadata' of ↵ | Joey Grover | 2015-09-01 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop | ||||
| | * | | Update USBTransport connection info to match SDL | Justin Dickow | 2015-08-12 | 1 | -2/+2 |
| | |/ | |||||
| * | | Merge branch 'feature/fifo-queue' of ↵ | Joey Grover | 2015-09-01 | 5 | -61/+7 |
| |\ \ | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop | ||||
| | * | | Changed to a fifo queue | Markos Rapitis | 2015-08-05 | 5 | -61/+7 |
| | | | | |||||
| * | | | Merge branch 'mrapitis-feature/deviceinfo' into develop | Joey Grover | 2015-08-28 | 4 | -16/+70 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'feature/deviceinfo' of https://github.com/mrapitis/sdl_android ↵ | Joey Grover | 2015-08-28 | 4 | -16/+70 |
| | |\ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | into mrapitis-feature/deviceinfo Conflicts: sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java | ||||
| | * | | | Made changes to automatically populate rai device info | Anil Dahiya | 2015-07-22 | 4 | -12/+68 |
| | |/ / | |||||
| * | | | Merge branch 'feature/lock_screen_icon' of ↵ | Joey Grover | 2015-08-28 | 5 | -2/+88 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop Conflicts: sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/RequestType.java | ||||
| | * | | | Fixed a type in onLockScreenIconDownloadError method. | Markos Rapitis | 2015-08-12 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Added some logic for handling lock screen icon requests and added APIs for ↵ | Mike Burke | 2015-03-12 | 4 | -8/+185 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | developers to access the icon Signed-off-by: Mike Burke <mike@livioconnect.com> | ||||
| | * | | | Added new RequestType enum value | Mike Burke | 2015-01-30 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Burke <mike@livioconnect.com> | ||||
| * | | | | Merge branch 'feature/heartbeat-update' of ↵ | Joey Grover | 2015-08-28 | 11 | -181/+353 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop Conflicts: sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlConnection.java sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlSession.java sdl_android_lib/src/com/smartdevicelink/protocol/IProtocolListener.java sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java sdl_android_lib/src/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java | ||||
| | * | | | | Updated wipro setversion method with v3 support. Enabling hb for v3 and higher | Anil Dahiya | 2015-07-27 | 2 | -2/+7 |
| | | | | | | |||||
| | * | | | | Kevin's Additional CleanUp of Callbacks | Anil Dahiya | 2015-07-27 | 7 | -109/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sdl_android_lib/src/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlConnection.java sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlSession.java sdl_android_lib/src/com/smartdevicelink/protocol/AbstractProtocol.java sdl_android_lib/src/com/smartdevicelink/protocol/IProtocolListener.java sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java | ||||
| | * | | | | Fixed a heartbeat multiplexing scenario. | Markos Rapitis | 2015-07-27 | 1 | -2/+3 |
| | | | | | | |||||
| | * | | | | More changes for heartbeat timeout. | Markos Rapitis | 2015-07-27 | 5 | -159/+178 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlConnection.java Conflicts: sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlConnection.java sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java | ||||
| | * | | | | Changing for fixing Heartbeat and adding Additional Timers | Anil Dahiya | 2015-07-13 | 10 | -39/+295 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'feature/debug-cleanup' of ↵ | Joey Grover | 2015-08-26 | 1 | -56/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop | ||||
| | * | | | | Removed logging originally used for policies troubleshooting. | Markos Rapitis | 2015-08-17 | 1 | -56/+1 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'feature/mtu-update' of ↵ | Joey Grover | 2015-08-26 | 1 | -21/+32 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop | ||||
| | * | | | | Commit check iDataSize against max mtu size | Justin Dickow | 2015-08-14 | 1 | -4/+1 |
| | | | | | | |||||
| | * | | | | Check iDataSize based on support MTU per version | Justin Dickow | 2015-08-06 | 1 | -5/+5 |
| | | | | | | |||||
| | * | | | | Made changes to handle v3 / v4 mtu sizes. | Markos Rapitis | 2015-08-06 | 1 | -16/+30 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'feature/audio-video-streaming_merged' of ↵ | Joey Grover | 2015-08-26 | 19 | -152/+901 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop | ||||
| | * | | | | Minor change for Suppressing warning of New Api | Anil Dahiya | 2015-07-23 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Removed static variable references from sdlencoder class, added setter methods | Rapitis, Markos (M.J.) | 2015-07-22 | 2 | -21/+39 |
| | | | | | | |||||
| | * | | | | Additional CleanUp for Audio/Video Streaming | Anil Dahiya | 2015-07-08 | 3 | -27/+8 |
| | | | | | | |||||
| | * | | | | Merge branch 'github/develop' into feature/audio-video-streaming | Anil Dahiya | 2015-07-07 | 183 | -2724/+4681 |
| | |\ \ \ \ | |||||
| | * | | | | | Moved minSdkVersion back to 8 | Rapitis, Markos (M.J.) | 2015-05-06 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Changes for Error Handling for Encoder | Dahiya, Anil (A.) | 2015-05-06 | 4 | -11/+27 |
| | | | | | | | |||||
| | * | | | | | Added encoding API's to proxy | Kevin Burdette | 2015-05-06 | 3 | -3/+232 |
| | | | | | | | |||||
| | * | | | | | Removed synchronization that caused deadlocks in sendBytesOverTransport. | Markos Rapitis | 2015-04-29 | 2 | -4/+1 |
| | | | | | | | |||||
| | * | | | | | Added basic javadocs and more error checking for video and audio services. | Markos Rapitis | 2015-04-29 | 2 | -34/+90 |
| | | | | | | | |||||
| | * | | | | | Updated logic for wait time for response recieved | Dahiya, Anil (A.) | 2015-04-24 | 1 | -6/+6 |
| | | | | | | | |||||
| | * | | | | | Added OnServiceNACKed to base proxy. | Markos Rapitis | 2015-04-24 | 4 | -1/+43 |
| | | | | | | | |||||
| | * | | | | | Fixed a bug where onProtocolSessionStarted is called for the wrong instance ↵ | Markos Rapitis | 2015-04-24 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | when performing a start service for NAV or PCM types. | ||||
| | * | | | | | Added functionality to pause and resume stream. | Markos Rapitis | 2015-04-24 | 5 | -9/+182 |
| | | | | | | | |||||
| | * | | | | | Changes for returning OnServiceEnded notification | Dahiya, Anil (A.) | 2015-04-24 | 4 | -1/+44 |
| | | | | | | | |||||
| | * | | | | | Added Implementation for onProtocolSessionEndedNACKed & ↵ | Dahiya, Anil (A.) | 2015-04-24 | 1 | -53/+150 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | onProtocolSessionEnded. Also, changes for returning result status for endPCM() & endH264() | ||||
| | * | | | | | Added hooks for onProtocolSessionEndedNACK, fixed onProtocolSessionStartedNACK | Markos Rapitis | 2015-04-24 | 7 | -20/+61 |
| | | | | | | |