summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* manually merge sdlmanagerfeature/lockscreen_managerBrettyWhite2018-08-281-12/+31
* Merge branch 'feature/issue_782_Android_Managers' into feature/lockscreen_man...BrettyWhite2018-08-288-64/+976
|\
| * Merge pull request #826 from smartdevicelink/feature/issue_782_video_streamin...Joey Grover2018-08-238-37/+967
| |\
| | * Merge branch 'feature/issue_782_Android_Managers' of https://github.com/smart...feature/issue_782_video_streaming_managerAustin Kirk2018-08-2272-596/+3855
| | |\ | | |/ | |/|
| | * Address more review commentsAustin Kirk2018-08-154-194/+100
| | * Addressing review commentsAustin Kirk2018-08-136-18/+28
| | * remove mock of View classAustin Kirk2018-08-021-1/+1
| | * Remove static keyword from view in testAustin Kirk2018-08-021-1/+1
| | * Remove encoder related calls (travis) and add testAustin Kirk2018-08-012-5/+44
| | * Add call to drain Encoder in testsAustin Kirk2018-07-311-0/+1
| | * Merge branch 'feature/issue_782_Android_Managers' of https://github.com/smart...Austin Kirk2018-07-3112-14/+1068
| | |\
| | * | Fixing state machine transitions and surface testAustin Kirk2018-07-312-3/+17
| | * | Add support for classic video streamingAustin Kirk2018-07-301-0/+77
| | * | Add state machine & public methods to check stateAustin Kirk2018-07-273-6/+186
| | * | Merge branch 'feature/issue_782_Android_Managers' of https://github.com/smart...Austin Kirk2018-07-259-39/+1012
| | |\ \
| | * | | Alter tests to successfully “start” a video streamAustin Kirk2018-07-252-20/+45
| | * | | Add test for video streaming, monitor hmiLevelAustin Kirk2018-07-253-28/+171
| | * | | Fix setting of context, remoteDisplayClassAustin Kirk2018-07-243-1/+101
| | * | | Implement VideoStreamingManager APIsAustin Kirk2018-07-234-11/+444
* | | | | fixes per reviewBrettyWhite2018-08-282-1/+9
* | | | | fixed invalid javadoc linkBrett2018-08-211-1/+1
* | | | | fixed naming across entire PR for deviceLogoBrett2018-08-213-31/+31
* | | | | clarified naming on devicelogo getterBrett2018-08-213-3/+3
* | | | | add missing getterBrett2018-08-211-0/+2
* | | | | resolve conflics in sdlmanagerBrett2018-08-211-10/+26
* | | | | Merge branch 'feature/issue_782_Android_Managers' into feature/lockscreen_man...Brett2018-08-2110-206/+446
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #838 from smartdevicelink/feature/issue_sdl_manager_lifecycleJoey Grover2018-08-213-46/+94
| |\ \ \ \
| | * | | | add required params to constructorfeature/issue_sdl_manager_lifecycleBrett2018-08-212-23/+24
| | * | | | update per review commentsBrett2018-08-213-25/+38
| | * | | | Update unit test for renamed listenerAustin Kirk2018-08-161-1/+6
| | * | | | fix per review commentsBrett2018-08-162-19/+10
| | * | | | Add ManagerListener with way to notify of disposalAustin Kirk2018-08-163-30/+68
| * | | | | Merge pull request #828 from smartdevicelink/feature/issue_782_Isdl_addOnResp...Joey Grover2018-08-218-129/+341
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix potential deadlockfeature/issue_782_Isdl_addOnResponseListenerBrett2018-08-161-3/+1
| | * | | | fixed system cap manager testsBrett2018-08-141-3/+3
| | * | | | fixed more per commentsBrett2018-08-144-9/+11
| | * | | | fixing per review commentsBrett2018-08-144-15/+16
| | * | | | Cast OnRPCListener to OnRPCResponseListener to handle the reponse correctly ...Bilal2018-07-271-1/+6
| | * | | | Remove unsed imports in SdlManagerBilal2018-07-271-2/+0
| | * | | | Add addOnHmiStatusListener and removeOnHmiStatusListener methods to SdlManagerBilal2018-07-271-0/+17
| | * | | | Make a new generic OnRPCListenerBilal2018-07-278-126/+148
| | * | | | Add addOnSystemCapabilityListener method to SystemCapabilityManager and IsdlBilal2018-07-276-17/+136
| | * | | | Update SystemCapabilityManagerTests tests to include Isdl.addOnRPCResponseLis...Bilal2018-07-261-0/+7
| | * | | | implement addOnRPCResponseListener in SdlManagerBilal2018-07-261-0/+10
| | * | | | Add addOnRPCResponseListener() method to IsdlBilal2018-07-263-2/+35
| | | |_|/ | | |/| |
* | | | | add one more null check in dispose()Brett2018-08-201-1/+3
* | | | | fix intent filter in lockscreen activity, fix docsBrett2018-08-202-2/+7
* | | | | manually solve conflicts. override back btnBrett2018-08-207-15/+49
* | | | | Merge branch 'feature/issue_782_Android_Managers' into feature/lockscreen_man...Brett2018-08-2080-531/+5531
|\ \ \ \ \ | |/ / / /
| * | | | Implement additional RC method in ProxyBridgeAustin Kirk2018-08-071-0/+6
View Lorry Controller Status