summaryrefslogtreecommitdiff
path: root/android
Commit message (Expand)AuthorAgeFilesLines
* Refactor tests to AndroidJUnit4RHenigan2020-06-1625-221/+424
* Refactor sdl Test file to not shadow junit importRHenigan2020-06-16312-7472/+7481
* Update Test Files for AndroidJUnit4RHenigan2020-06-1614-101/+257
* Update more tests for AndroidJUnit4RHenigan2020-06-153-24/+45
* Refactor some test classes for AndroidJUnit4RHenigan2020-06-1511-71/+179
* Merge pull request #1366 from smartdevicelink/feature/android_lcmJulian Kast2020-06-124-1200/+766
|\
| * Update formattingfeature/android_lcmBilal Alsharifi2020-06-113-304/+321
| * Add cycle proxy logic to LCMBilal Alsharifi2020-06-091-6/+57
| * add createSession method to LCMBilal Alsharifi2020-06-081-1/+4
| * Remove unsed vars from LifecycleManagerBilal Alsharifi2020-06-081-8/+0
| * Remove unused importBilal Alsharifi2020-06-051-1/+0
| * Fix SdlManager unit testsBilal Alsharifi2020-06-051-27/+23
| * Add logic to set SdlSecurityBase.contextBilal Alsharifi2020-06-052-0/+24
| * Merge branch 'develop' into feature/android_lcmBilal Alsharifi2020-06-043-6/+52
| |\
| * | Move NAV & PCM code to Android LifecycleManagerBilal Alsharifi2020-06-031-0/+265
| * | Cleanup LCMBilal Alsharifi2020-06-031-5/+5
| * | Add NAV & PCM dupport to EncryptionLifecycleManagerBilal Alsharifi2020-06-021-0/+3
| * | Update SdlManager javadocBilal Alsharifi2020-06-021-3/+2
| * | Check NPE in onProxyClosedBilal Alsharifi2020-06-011-1/+1
| * | Update code formattingBilal Alsharifi2020-05-292-102/+70
| * | Merge branch 'develop' into feature/android_lcmBilal Alsharifi2020-05-298-11/+107
| |\ \
| * | | Setup Android SdlManager to use LifecycleManagerBilal Alsharifi2020-05-292-911/+52
| * | | Add Android LifecycleManager constructorBilal Alsharifi2020-05-281-0/+33
| * | | Move constructor from BaseLifecycleManager to LifecycleManagerBilal Alsharifi2020-05-281-5/+0
| * | | Fix symlinksBilal Alsharifi2020-05-282-0/+93
* | | | Revert "Test Pipeline still fails for other issues"bugfix/issue_1374RHenigan2020-06-081-1/+1
* | | | Test Pipeline still fails for other issuesRHenigan2020-06-081-1/+1
* | | | Target Android 28RHenigan2020-06-081-1/+1
* | | | Target SDK 29 and add foregroundServiceType paramRHenigan2020-06-082-4/+7
| |_|/ |/| |
* | | Merge pull request #1325 from zhouxin627/bugfix/1241Julian Kast2020-06-034-11/+70
|\ \ \ | |_|/ |/| |
| * | fix spacehannianqiao2020-06-031-2/+1
| * | fix problemhannianqiao2020-06-031-1/+1
| * | fix problem in third reviewhannianqiao2020-06-032-3/+3
| * | fix problem in second reviewhannianqiao2020-05-223-9/+18
| * | fix problem in reviewhannianqiao2020-05-144-20/+30
| * | hmiDisplayLanguage and vr/tts language set separatelyhannianqiao2020-01-164-14/+55
* | | Merge pull request #1355 from smartdevicelink/ios_Alignment/LockScreenRobert Henigan2020-05-297-11/+98
|\ \ \
| * | | Updated Icon scalingios_Alignment/LockScreenJulian Kast2020-05-209-1/+1
| * | | Fixed FormattingJulian Kast2020-05-191-9/+9
| * | | Fixed issue with TextColor for warning messageJulian Kast2020-05-191-7/+7
| * | | Changes LocScreen Icon to align with iOSJulian Kast2020-05-195-11/+98
* | | | Merge pull request #1356 from smartdevicelink/bugfix/issue_1335Julian Kast2020-05-291-0/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add test to ensure Text and Images capabilities are setRHenigan2020-05-261-0/+9
* | | | Merge remote-tracking branch 'upstream/develop' into feature/issue-1132Shinichi Watanabe2020-05-2812-99/+224
|\ \ \ \
| * \ \ \ Merge pull request #1363 from smartdevicelink/feature/issue_1362Bilal Alsharifi2020-05-277-62/+93
| |\ \ \ \
| | * | | | Fix rpcs param type in Isdl.sendRPCs()Bilal Alsharifi2020-05-273-3/+3
| | * | | | Implement sendRPCs() in IsdlBilal Alsharifi2020-05-263-0/+23
| | * | | | Deprecate APIs to prepare for next major changeBilal Alsharifi2020-05-224-62/+70
| * | | | | Merge branch 'master' into developBilal Alsharifi2020-05-263-5/+79
| |\ \ \ \ \
| | * | | | | Update version to 4.11.1Bilal Alsharifi2020-05-261-1/+1