delta/smartdevicelink/sdl_android.git - github.com: smartdevicelink/sdl

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android ↵feature/android_studio	Joey Grover	2016-09-01	200	-1633/+6677
\|\ \| \| \| \| \| \|	into feature/android_studio
\| *	Merge pull request #326 from smartdevicelink/feature/router_version_passback	Joey Grover	2016-08-09	3	-8/+16
\| \|\ \| \| \| \| \| \|	Add router service version to register client response
\| \| *	Add router service version to register client responsefeature/router_version_passback	Joey Grover	2016-07-28	3	-8/+16
\| \|/
\| *	Merge pull request #312 from smartdevicelink/bugfix/issue_311	Joey Grover	2016-07-28	7	-76/+239
\| \|\ \| \| \| \| \| \|	Remove deprecated methods and correct hardware connect check
\| \| *	Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android ↵	Joey Grover	2016-07-28	29	-968/+588
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into bugfix/issue_311 # Conflicts: # HelloSdl/src/com/hellosdl/MainActivity.java # sdl_android_lib/src/com/smartdevicelink/transport/SdlBroadcastReceiver.java # sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
\| * \|	Merge pull request #323 from thomasheike/patch-2	Joey Grover	2016-07-27	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Fixed ClassCastException in openConnection
\| \| * \|	Fixed ClassCastException in openConnection	Thomas Heike	2016-07-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From the crash reports in PlayStore I receive some ClassCastExceptions every now and then on devices (seems to be exclusive to tablets) running Android 4.1 and 4.2. The exceptions occur in BTTransport.openConnection when some exception is cast to SdlException. The reports contain no line numbers ... I suspect line 190 to be the cause of the error, since this is the only line containing an unchecked cast to SdlException.
\| * \| \|	Merge pull request #320 from smartdevicelink/bugfix/issue_319	Joey Grover	2016-07-13	1	-4/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Correct abstract class type in SdlBroadcastReceiver
\| \| * \| \|	Give return Class correct parameterized typebugfix/issue_319	Joey Grover	2016-07-06	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Fixes #319	Joey Grover	2016-07-06	1	-4/+3
\| \| \|/ /
\| * \| \|	Merge pull request #318 from smartdevicelink/bugfix/issue_309	Joey Grover	2016-07-13	21	-926/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Remove HelloSdl project
\| \| * \| \|	Fix #309 removes HelloSdl projectbugfix/issue_309	Joey Grover	2016-07-06	21	-926/+0
\| \| \|/ /
\| * \| \|	Merge pull request #317 from smartdevicelink/feature/update_proxy_builder_multi	Joey Grover	2016-07-13	1	-2/+22
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Builder to use multiplexing as default transport.
\| \| * \| \|	Added new constructor to handle multiplexing as default transport.feature/update_proxy_builder_multi	Joey Grover	2016-07-05	1	-2/+22
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Deprecated previous method but ensured it would still work.
\| * \| \|	Merge pull request #316 from smartdevicelink/bugfix/issue_313	Joey Grover	2016-07-13	1	-8/+501
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Reimplement methods that should have been deprecated
\| \| * \| \|	Fixes #313bugfix/issue_313	Joey Grover	2016-07-05	1	-8/+501
\| \| \| \| \|
\| * \| \| \|	Merge pull request #322 from smartdevicelink/bugfix/issue_321	Joey Grover	2016-07-13	1	-2/+2
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	Correct disconnect logic when bluetooth adapter is being turned off
\| \| * \| \|	Fixes #321bugfix/issue_321	Joey Grover	2016-07-07	1	-2/+2
\| \|/ / /
\| * \| \|	Merge pull request #314 from smartdevicelink/bugfix/issue_310	Joey Grover	2016-07-05	2	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Removed hardcoded string usage for "activity"
\| \| * \| \|	Fixes #310bugfix/issue_310	Joey Grover	2016-06-28	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge pull request #306 from smartdevicelink/bugfix/issue_303	Joey Grover	2016-07-05	1	-1/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add null check when looking for service connection
\| \| * \| \| \|	Fixes #303bugfix/issue_303	Joey Grover	2016-06-21	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a check for null on the passed in context into SdlBroadcastReceiver.
\| * \| \| \| \|	Merge pull request #304 from smartdevicelink/bugfix/issue_213	Joey Grover	2016-07-05	1	-4/+43
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|	Rename TouchEvent helper methods
\| \| * \| \| \|	Fixes #213bugfix/issue_213	Joey Grover	2016-06-21	1	-4/+43
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gives better names to methods and deprecates old.
\| * \| \| \|	Merge pull request #286 from smartdevicelink/feature/improved_resume_with_data	Joey Grover	2016-06-28	1	-8/+8
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	Fix proxy getter for app resumption with persistent data
\| \| * \| \|	Made changes to better handle app resumption with data persistence to key ↵feature/improved_resume_with_data	Markos Rapitis	2016-02-04	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	off of a combination of success and the result code.
\| \| \| \| *	Removed handler leak suppression and did things the right waybugfix/issue_311	Joey Grover	2016-07-27	1	-8/+20
\| \| \| \| \|
\| \| \| \| *	Rename method to find out if router service has a transport conneciton	Joey Grover	2016-07-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since it now returns void the other name was misleading
\| \| \| \| *	Removed debug log statement	Joey Grover	2016-07-11	1	-1/+0
\| \| \| \| \|
\| \| \| \| *	Refactored conneciton code from router to clients.	Joey Grover	2016-06-27	4	-24/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clients will now receive information on a connected device from the router service during their registration.
\| \| \| \| *	Removal of deprecated shared prefs mode, fixes #311	Joey Grover	2016-06-24	6	-61/+225
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge pull request #250 from smartdevicelink/feature/documentation-update	Joey Grover	2016-06-22	169	-597/+5842
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	Feature/documentation update
\| \| * \|	Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android ↵	Joey Grover	2016-06-22	67	-1381/+8259
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \|	into feature/documentation-update
\| \| * \|	Added more comments for video streaming methods.feature/documentation-update	Markos Rapitis	2015-10-23	1	-0/+18
\| \| \| \|
\| \| * \|	Merge branch 'develop' into feature/documentation-update	Rapitis, Markos (M.J.)	2015-10-14	9	-142/+235
\| \| \|\ \
\| \| * \| \|	fixed a problem from git automerge on inline docs	Markos Rapitis	2015-09-28	1	-3/+1
\| \| \| \| \|
\| \| * \| \|	added project.properites	Rapitis, Markos (M.J.)	2015-09-25	1	-0/+12
\| \| \| \| \|
\| \| * \| \|	updated docs	Rapitis, Markos (M.J.)	2015-09-25	39	-528/+2086
\| \| \|\ \ \
\| \| * \| \| \|	updated documentationfeature/ongoing-docs	HansenKirk	2015-09-25	129	-1193/+1196
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'github/develop' into feature/UpdatedDocs	Markos Rapitis	2015-08-12	37	-2846/+633
\| \| \|\ \ \ \
\| \| * \| \| \| \|	removed special characters	virat-shukla	2015-07-24	13	-73/+73
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Updated documentation for Java docs	Anil Dahiya	2015-07-16	136	-115/+5340
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Added maven deploy	Joey Grover	2016-06-21	1	-0/+81
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Added bintray options to gradle file	Joey Grover	2016-06-16	1	-0/+23
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update gradle files for use with Android Studio	Joey Grover	2016-06-16	6	-1/+309
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'master' into develop	Joey Grover	2016-06-15	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Update README.md	Corey Maylone	2016-06-09	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #78 from smartdevicelink/feature/multiplexing	Joey Grover	2016-06-14	61	-1203/+7983
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merging Feature/multiplexing
\| * \| \| \| \| \| \|	Keeps track of HashIds per session to use in case of binder dyingfeature/multiplexing	Joey Grover	2016-06-14	1	-6/+43
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android ↵	Joey Grover	2016-06-09	10	-39/+58
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into feature/multiplexing # 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/ProtocolFrameHeaderFactory.java # sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java # sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java