summaryrefslogtreecommitdiff
path: root/android/sdl_android
Commit message (Collapse)AuthorAgeFilesLines
* Remove underscores in test method namesbugfix/fix_method_naming_testsJoey Grover2020-09-212-6/+6
|
* Fix unit testsfeature/hmi_capabilities_fixBilal Alsharifi2020-09-211-0/+2
|
* Update HMICapabilities APIs namesBilal Alsharifi2020-09-211-1/+1
|
* Reformat RTPH264Packetizer & StreamPacketizerBilal Alsharifi2020-09-211-216/+208
|
* Merge branch 'develop' into feature/code_formattingBilal Alsharifi2020-09-211-202/+216
|\ | | | | | | | | | | # Conflicts: # android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java # base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
| * Merge pull request #1480 from smartdevicelink/bugfix/issue_1398Julian Kast2020-09-211-1/+7
| |\ | | | | | | Fix Issue 1398 - Avoid deadlock from using blocking queues
| | * Fix potential deadlock in media streaming classesbugfix/issue_1398Joey Grover2020-09-021-1/+7
| | | | | | | | | | | | Fixes #1398
* | | Fix fomratting per code reviewfeature/code_formattingBilal Alsharifi2020-09-181-1/+0
| | |
* | | Remove extra semicolonsBilal Alsharifi2020-09-182-3/+0
| | |
* | | Remove extra semicolonBilal Alsharifi2020-09-181-1/+0
| | |
* | | Fix unit testsBilal Alsharifi2020-09-172-1/+7
| | |
* | | Merge branch 'develop' into feature/code_formattingBilal Alsharifi2020-09-172-51/+33
|\ \ \ | |/ / | | | | | | | | | # Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java
| * | Merge pull request #1504 from smartdevicelink/feature/fix_testsRobert Henigan2020-09-172-51/+36
| |\ \ | | | | | | | | Fix HapticInterfaceManagerTest
| | * | Fix HapticInterfaceManagerTestfeature/fix_testsBilal Alsharifi2020-09-171-34/+36
| | | |
| | * | Move HapticInterfaceManagerTest to androidTestBilal Alsharifi2020-09-172-17/+0
| | | |
* | | | Run the Reformat Code tool on the projectBilal Alsharifi2020-09-17578-46377/+46529
|/ / /
* | | Merge pull request #1503 from smartdevicelink/feature/fix_todosRobert Henigan2020-09-174-13/+31
|\ \ \ | | | | | | | | Fix some todo comments
| * | | Fix todo in SdlPacketTestsBilal Alsharifi2020-09-171-1/+13
| | | |
| * | | Fix some todosfeature/fix_todosBilal Alsharifi2020-09-173-12/+18
| |/ /
* | | [SDL 0278] Screen Manager Template Management (#1492)Julian Kast2020-09-172-52/+255
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Work in Progress * BaseTextAndGraphicsManager changes * TextAndGraphicsUpdateOperation updates for template management * TextAndGraphicsState updates for template managment * remove comment and fix existing unit test * Added getTemplateConfiguration method and made currentState method package private * Add test to TextAndGraphicManagerTest * Fix unit test and remove commented out code * Fix test to expand code cov * Remove added constructors and use chainable setters * Fix error in shouldUpdateTemplateConfig method * Added unit test to test template change * Added unit test * Added check to cancel the operation if text / layout changes and images still need to be uploaded * Add unit test for if a show fails * Added comments and simplified logic * Fix comparing TemplateConfigurations * Add comments and fix formatting * Add java Docs to baseScreenManager * Change name of var and fix formatiing * Added final to vars that go reverted when fixing merge conflicts * Add @nonNull to templateConfiguration * Removing sending newScreenData to updatePendingOperationsWithNewScreenData as it is equal to currentScreenData at this point * Make setLayout var local * Fixing error where setDisplayLayout dosn't call listener if it fails * Added showRPCSupportsTemplateConfiguration() Method to T&G update operation * Added check to make sure we don't get an npe if internalInterface is null * added check to make sure we don't send an unnecessary templateConfig with show * Fixed issue with setDisplayLayout request updating capabilities when request fails * Documentation updates to screenManager * Formatting fix * Fix javaDocs and comments * Fixed issue with updateCurrentScreenDataFromShow * Change TextsAndGraphicsState to TextAndGraphicState to align with IOS Co-authored-by: Julian Kast <julian@livio.com>
* | Merge pull request #1494 from smartdevicelink/feature/fix_rpcs_mismatchJulian Kast2020-09-168-90/+55
|\ \ | | | | | | Fix RPCs Mismatches
| * \ Merge branch 'develop' into feature/fix_rpcs_mismatchBilal Alsharifi2020-09-1545-242/+244
| |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java # base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
| * | | Undo some deprecationsBilal Alsharifi2020-09-141-2/+6
| | | |
| * | | Simplify RPCGenericTests casesBilal Alsharifi2020-09-141-36/+11
| | | |
| * | | fix RPCs mismatch part 2Bilal Alsharifi2020-09-141-40/+41
| | | |
| * | | fix RPCs mismatch part 1Bilal Alsharifi2020-09-112-15/+2
| | | |
| * | | Add missing RPC paramsBilal Alsharifi2020-09-117-31/+29
| | | |
* | | | Fix javadoc errors in unit testsfeature/cleanup_javadocsBilal Alsharifi2020-09-1611-30/+14
| | | |
* | | | Cleanup Javadocs after RPC RefactorRHenigan2020-09-16199-199/+199
| | | |
* | | | Merge branch 'develop' into feature/move_proxy_interfacesRHenigan2020-09-1513-14/+14
|\ \ \ \
| * \ \ \ Merge branch 'develop' into feature/rename_sdl_connectionfeature/rename_sdl_connectionBilal Alsharifi2020-09-1545-242/+244
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Rename SdlConnection to sessionBilal Alsharifi2020-09-1413-14/+14
| | |/ / | |/| |
* | | | Move proxy interfaces to better packagesfeature/move_proxy_interfacesRHenigan2020-09-1545-54/+53
| |/ / |/| |
* | | Make requested review changesBilal Alsharifi2020-09-142-4/+1
| | |
* | | Change commit() back to apply()Bilal Alsharifi2020-09-142-5/+5
| | |
* | | Change commit() back to apply()Bilal Alsharifi2020-09-141-1/+1
| | |
* | | Merge branch 'develop' into feature/fix_lint_warningsfeature/fix_lint_warningsBilal Alsharifi2020-09-11152-105/+158
|\ \ \ | |/ /
| * | Remove unused imports from TransportBrokerfeature/optimize_importsBilal Alsharifi2020-09-091-4/+0
| | |
| * | Merge branch 'develop' into feature/optimize_importsBilal Alsharifi2020-09-095-169/+36
| |\ \
| * | | Optimize imports for android folderBilal Alsharifi2020-09-0915-10/+16
| | | |
| * | | Optimize imports for unit testsBilal Alsharifi2020-09-09136-91/+142
| | | |
* | | | fix warnings in transport part2Bilal Alsharifi2020-09-1015-111/+110
| | | |
* | | | fix warnings in utilBilal Alsharifi2020-09-106-18/+24
| | | |
* | | | Fix warnings in traceBilal Alsharifi2020-09-101-5/+4
| | | |
* | | | Fix warnings in streamingBilal Alsharifi2020-09-102-15/+12
| | | |
* | | | Fix warnings in SdlConnectionBilal Alsharifi2020-09-101-1/+2
| | | |
* | | | Fix unit testsBilal Alsharifi2020-09-101-0/+1
| | | |
* | | | Remove unnecessary modifiers from interfacesBilal Alsharifi2020-09-102-3/+3
| | | |
* | | | Fix warnings in protocol part 2Bilal Alsharifi2020-09-105-18/+17
| | | |
* | | | Fix warnings in encoderBilal Alsharifi2020-09-103-9/+9
| | | |
View Lorry Controller Status