summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed Logs and unneccessary test casebugfix/issue_383Austin Kirk2017-02-071-6/+4
|
* Added Unit Test for This CaseAustin Kirk2017-02-071-1/+15
|
* Fixing case where config.getService() returns nullAustin Kirk2017-01-241-4/+4
| | | | -add condition to if statement so it shorts if it is null
* Merge pull request #374 from smartdevicelink/develop4.2.3Joey Grover2017-01-172-30/+65
|\ | | | | Pull in PR #367 as hotfix into master
| * Merge branch 'bugfix/issue_371' of ↵Joey Grover2016-12-136-34/+112
| |\ | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop
| * \ Merge pull request #367 from smartdevicelink/bugfix/issue_347Joey Grover2016-12-112-30/+65
| |\ \ | | | | | | | | Fix continuous proxy cycle after AOA usb disconnect occurs
| | * | Revised if statement logic.bugfix/issue_347Markos Rapitis2016-12-021-2/+5
| | | |
| | * | Added queryUsbAcc flag to transport config. Removed static boolean from usb ↵Markos Rapitis2016-12-022-7/+10
| | | | | | | | | | | | | | | | transport.
| | * | Added a null check for input stream.Markos Rapitis2016-11-181-2/+5
| | | |
| | * | Added initializeAccessory method back into openConnection, now keeping track ↵Markos Rapitis2016-11-181-5/+35
| | | | | | | | | | | | | | | | of inital connection internally. Removed synchronized on disconnect as calling methods synchronize and thread locking was occurring. Fixed a find / replace comment.
| | * | Cleaned up aoa logic to gracefully handle connect / disconnect events. Added ↵Markos Rapitis2016-11-172-32/+28
| | | | | | | | | | | | | | | | ability to disable shareConnection parameter from aoa transport.
* | | | Merge pull request #372 from smartdevicelink/bugfix/issue_3714.2.2Joey Grover2016-12-136-34/+112
|\ \ \ \ | | |_|/ | |/| | [Hotfix] RSVP Improvements
| * | | Revert removal of if statment to check what state is receivedbugfix/issue_371Joey Grover2016-12-091-1/+12
| | | |
| * | | Revert removal of STATE_CHANGED in action filterJoey Grover2016-12-091-0/+2
| | | |
| * | | Added RSVP check during force connect to ensure not discconting legacy if ↵Joey Grover2016-12-081-5/+12
| | | | | | | | | | | | | | | | not trusted
| * | | Added ability to save last reqest sent to RSVP server.Joey Grover2016-12-072-11/+85
| | | | | | | | | | | | | | | | If we are not facing a cached list timeout but our request info is different than what was cached, we will perform the request.
| * | | Update default router list with extra OEM companion app and unit tests to ↵Joey Grover2016-12-073-4/+4
| | | | | | | | | | | | | | | | reflect.
| * | | No longer ignore an SDL enabled intent from untrusted router service. ↵Joey Grover2016-12-072-8/+8
| | | | | | | | | | | | | | | | Include boolean if trusted or not
| * | | Change RSVP cache list timeout from 24 hours to a weekJoey Grover2016-12-071-1/+1
| | | |
| * | | Remove call to RSVP server during bluetooth state changeJoey Grover2016-12-071-16/+0
|/ / /
* | | Merge pull request #370 from smartdevicelink/bugfix/issue_369Joey Grover2016-12-071-1/+1
|\ \ \ | |/ / | | | Change the package name for the unit tests
| * | Change the package name for the unit testsbugfix/issue_369Joey Grover2016-12-061-1/+1
|/ /
* | Merge pull request #366 from smartdevicelink/bugfix/issue_3654.2.1Joey Grover2016-11-224-7/+23
|\ \ | |/ |/| Hotfix - NPE crash in RouterServiceProvider
| * Amend previous commit with additional weak reference usagebugfix/issue_365Joey Grover2016-11-181-1/+1
| |
| * Make WeakReferences final objects to avoid checking for nullJoey Grover2016-11-182-8/+8
| |
| * Fix potential NPE in SdlRouterService WeakRefernce usageJoey Grover2016-11-181-1/+10
| |
| * Fixed potential NPE in SdlBroadcastReceiverJoey Grover2016-11-181-1/+5
| |
| * Check null status for SdlRouterServiceProvider weak referenceJoey Grover2016-11-181-0/+3
|/
* Merge pull request #364 from smartdevicelink/bugfix/issue_3634.2.0release/4.2.0-rc2Joey Grover2016-11-141-0/+1
|\ | | | | Fix NPE crash in TransportBroker
| * Added a return statement after null check in TransportBrokerbugfix/issue_363Joey Grover2016-11-101-0/+1
|/ | | | (╯°□°)╯︵ ┻━┻
* Merge branch 'hotfix/issue_357' of ↵release/4.2.0-rc1Joey Grover2016-11-102-48/+69
|\ | | | | | | | | | | | | https://github.com/smartdevicelink/sdl_android into develop # Conflicts: # sdl_android_lib/src/com/smartdevicelink/transport/SdlBroadcastReceiver.java
| * Added check for trusted router list during SDL enabled broadcast receivedhotfix/issue_357Joey Grover2016-11-011-11/+20
| |
| * Remove code that stopped self untrusted router serviceJoey Grover2016-11-011-7/+0
| | | | | | | | This becomes an issue if the app hasn’t updated it’s trusted app list but other apps have.
| * Added check for trusted router list during check for conencted router servicesJoey Grover2016-11-012-30/+50
| |
* | Merge pull request #354 from smartdevicelink/bugfix/issue_353Joey Grover2016-11-104-4/+48
|\ \ | | | | | | Add protection against incorrect implementations of SdlRouterService
| * | Add protection against incorrect implementations of SdlRouterServicebugfix/issue_353Joey Grover2016-10-274-4/+48
| |/ | | | | | | Adding checks to ensure the SdlRouterService is exported and prevent crashes when attempting to connect to nonexported services.
* | Merge pull request #362 from smartdevicelink/bugfix/issue_361Joey Grover2016-11-101-2/+1
|\ \ | | | | | | Fix NPE in SdlBroadcastReceiver
| * | Fix #361bugfix/issue_361Joey Grover2016-11-081-2/+1
|/ / | | | | | | Change method call to handle case where the extra doesn’t exist
* | Merge pull request #360 from smartdevicelink/feature/sdl_icon_updateJoey Grover2016-11-0712-3/+10
|\ \ | | | | | | SDL icon update
| * | Update large notification icon to newer logofeature/sdl_icon_updateJoey Grover2016-11-037-2/+2
| | |
| * | Add new icon for notificaiton trayJoey Grover2016-11-026-1/+8
| | |
* | | Merge pull request #337 from smartdevicelink/feature/aoa_improvementsJoey Grover2016-11-073-15/+27
|\ \ \ | | | | | | | | AOA improvements
| * | | Revert manifest min to API level 8feature/aoa_improvementsJoey Grover2016-11-041-3/+1
| | | |
| * | | Remove HelloSdl artifactJoey Grover2016-10-101-7/+0
| | | |
| * | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android ↵Joey Grover2016-10-072-8/+11
| |\ \ \ | | | | | | | | | | | | | | | into feature/aoa_improvements
| * \ \ \ Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android ↵Joey Grover2016-09-30224-2328/+7954
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into feature/aoa_improvements # Conflicts: # HelloSdl/AndroidManifest.xml # HelloSdl/project.properties # HelloSdl/src/com/hellosdl/sdl/SdlService.java
| * \ \ \ \ Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android ↵Joey Grover2016-06-1423-128/+450
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into feature/aoa_improvements # Conflicts: # HelloSdl/src/com/hellosdl/sdl/SdlService.java
| * | | | | | Made it possible to use AOA without having app up and running.Joey Grover2016-05-196-26/+75
| | | | | | |
* | | | | | | Merge pull request #348 from smartdevicelink/bugfix/#338Joey Grover2016-11-031-3/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Keep server socket alive until transport shutdown
| * | | | | | | Adding a flag to MultiplexBluetoothTransport to keep server socket alive ↵bugfix/#338Joey Grover2016-10-241-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | post connection until stopped