summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Hotfix/mtu size for v3 & v4 protocols"revert-275-hotfix/mtuJoey Grover2016-01-191-2/+2
|
* Merge pull request #275 from smartdevicelink/hotfix/mtuJoey Grover2016-01-191-2/+2
|\ | | | | Hotfix/mtu size for v3 & v4 protocols
| * Adjusted mtu sizes to match value on core side. (131072 - 12 = 131060)Markos Rapitis2015-12-141-2/+2
|/
* Merge branch 'develop'4.0.0Joey Grover2015-09-15173-1737/+3493
|\
| * Merge pull request #262 from smartdevicelink/release/4.0.0-rcJoey Grover2015-09-151-0/+79
| |\ | | | | | | Added change log for v4
| | * Added change log for v4release/4.0.0-rcJoey Grover2015-09-151-0/+79
| |/
| * Merge branch 'feature/sdl-proxy-builder' of ↵Joey Grover2015-09-141-0/+129
| |\ | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop
| | * Refactored ngnAppName to become shortAppNameMarkos Rapitis2015-08-281-6/+6
| | |
| | * Updated names to match conventions.Markos Rapitis2015-08-241-15/+15
| | |
| | * Added SdlProxyBuilder class.Markos Rapitis2015-08-241-0/+129
| | |
| * | Merge branch 'hotfix/usb_metadata' of ↵Joey Grover2015-09-011-2/+2
| |\ \ | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop
| | * | Update USBTransport connection info to match SDLJustin Dickow2015-08-121-2/+2
| | |/
| * | Merge branch 'feature/fifo-queue' of ↵Joey Grover2015-09-015-61/+7
| |\ \ | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop
| | * | Changed to a fifo queueMarkos Rapitis2015-08-055-61/+7
| | | |
| * | | Merge branch 'mrapitis-feature/deviceinfo' into developJoey Grover2015-08-284-16/+70
| |\ \ \
| | * \ \ Merge branch 'feature/deviceinfo' of https://github.com/mrapitis/sdl_android ↵Joey Grover2015-08-284-16/+70
| | |\ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into mrapitis-feature/deviceinfo Conflicts: sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java
| | * | | Made changes to automatically populate rai device infoAnil Dahiya2015-07-224-12/+68
| | |/ /
| * | | Merge branch 'feature/lock_screen_icon' of ↵Joey Grover2015-08-285-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 Rapitis2015-08-121-2/+2
| | | | |
| | * | | Added some logic for handling lock screen icon requests and added APIs for ↵Mike Burke2015-03-124-8/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | developers to access the icon Signed-off-by: Mike Burke <mike@livioconnect.com>
| | * | | Added new RequestType enum valueMike Burke2015-01-301-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Burke <mike@livioconnect.com>
| * | | | Merge branch 'feature/heartbeat-update' of ↵Joey Grover2015-08-2811-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 higherAnil Dahiya2015-07-272-2/+7
| | | | | |
| | * | | | Kevin's Additional CleanUp of CallbacksAnil Dahiya2015-07-277-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 Rapitis2015-07-271-2/+3
| | | | | |
| | * | | | More changes for heartbeat timeout.Markos Rapitis2015-07-275-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 TimersAnil Dahiya2015-07-1310-39/+295
| | | |/ / | | |/| |
| * | | | Merge branch 'feature/debug-cleanup' of ↵Joey Grover2015-08-261-56/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop
| | * | | | Removed logging originally used for policies troubleshooting.Markos Rapitis2015-08-171-56/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'feature/mtu-update' of ↵Joey Grover2015-08-261-21/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop
| | * | | | Commit check iDataSize against max mtu sizeJustin Dickow2015-08-141-4/+1
| | | | | |
| | * | | | Check iDataSize based on support MTU per versionJustin Dickow2015-08-061-5/+5
| | | | | |
| | * | | | Made changes to handle v3 / v4 mtu sizes.Markos Rapitis2015-08-061-16/+30
| | | |/ / | | |/| |
| * | | | Merge branch 'feature/audio-video-streaming_merged' of ↵Joey Grover2015-08-2619-152/+901
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop
| | * | | | Minor change for Suppressing warning of New ApiAnil Dahiya2015-07-231-1/+2
| | | | | |
| | * | | | Removed static variable references from sdlencoder class, added setter methodsRapitis, Markos (M.J.)2015-07-222-21/+39
| | | | | |
| | * | | | Additional CleanUp for Audio/Video StreamingAnil Dahiya2015-07-083-27/+8
| | | | | |
| | * | | | Merge branch 'github/develop' into feature/audio-video-streamingAnil Dahiya2015-07-07183-2724/+4681
| | |\ \ \ \
| | * | | | | Moved minSdkVersion back to 8Rapitis, Markos (M.J.)2015-05-061-1/+1
| | | | | | |
| | * | | | | Changes for Error Handling for EncoderDahiya, Anil (A.)2015-05-064-11/+27
| | | | | | |
| | * | | | | Added encoding API's to proxyKevin Burdette2015-05-063-3/+232
| | | | | | |
| | * | | | | Removed synchronization that caused deadlocks in sendBytesOverTransport.Markos Rapitis2015-04-292-4/+1
| | | | | | |
| | * | | | | Added basic javadocs and more error checking for video and audio services.Markos Rapitis2015-04-292-34/+90
| | | | | | |
| | * | | | | Updated logic for wait time for response recievedDahiya, Anil (A.)2015-04-241-6/+6
| | | | | | |
| | * | | | | Added OnServiceNACKed to base proxy.Markos Rapitis2015-04-244-1/+43
| | | | | | |
| | * | | | | Fixed a bug where onProtocolSessionStarted is called for the wrong instance ↵Markos Rapitis2015-04-241-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | when performing a start service for NAV or PCM types.
| | * | | | | Added functionality to pause and resume stream.Markos Rapitis2015-04-245-9/+182
| | | | | | |
| | * | | | | Changes for returning OnServiceEnded notificationDahiya, Anil (A.)2015-04-244-1/+44
| | | | | | |
| | * | | | | Added Implementation for onProtocolSessionEndedNACKed & ↵Dahiya, Anil (A.)2015-04-241-53/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | onProtocolSessionEnded. Also, changes for returning result status for endPCM() & endH264()
| | * | | | | Added hooks for onProtocolSessionEndedNACK, fixed onProtocolSessionStartedNACKMarkos Rapitis2015-04-247-20/+61
| | | | | | |