Merge branch 'develop' into bugfix/issue_1237bugfix/issue_1237

7 files changed, 86 insertions, 63 deletions

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 21f390e53..1075a8f8d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-[Delete any non-applicable sections, but we may ask for more information. Please reference the [SmartDeviceLink GitHub Best Practices](https://d83tozu1c8tt6.cloudfront.net/media/resources/SDL_GitHub_BestPractices.pdf) for further instructions on how to enter an issue.]
+[Delete any non-applicable sections, but we may ask for more information or close the issue if the template is not followed. Please reference the [SmartDeviceLink GitHub Best Practices](https://d83tozu1c8tt6.cloudfront.net/media/resources/SDL_GitHub_BestPractices.pdf) for further instructions on how to enter an issue.]
 
 ### Bug Report
 [Summary]
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 14e81feee..c0782f1b7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,19 @@ This PR is **[ready / not ready]** for review.
 This PR makes **[no / minor / major]** API changes.
 
 ### Testing Plan
-[Describe how you plan to unit test the changes in this PR]
+- [ ] I have verified that I have not introduced new warnings in this PR (or explain why below)
+- [ ] I have run the unit tests with this PR
+- [ ] I have tested this PR against Core and verified behavior (if applicable, if not applicable, explain why below).
+- [ ] I have tested Android, Java SE, and Java EE
+
+#### Unit Tests
+[Describe the unit tests and behaviors added in this PR]
+
+#### Core Tests
+[List of tests performed against Core and behaviors verified]
+
+Core version / branch / commit hash / module tested against: [INSERT]
+HMI name / version / branch / commit hash / module tested against: [INSERT]
 
 ### Summary
 [Summary of PR changes]
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
new file mode 100644
index 000000000..99e4a5029
--- /dev/null
+++ b/.github/workflows/android.yml
@@ -0,0 +1,41 @@
+name: GitHub CI
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: macOS-latest
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v1
+      
+    - name: Setup JDK
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+        
+    - name: Sdl Android Tests
+      # For more info, please check out: https://github.com/marketplace/actions/android-emulator-runner
+      uses: reactivecircus/android-emulator-runner@v1
+      with:
+        api-level: 29
+        script: ./android/gradlew -p ./android :sdl_android:connectedCheck
+        
+    - name: Hello Sdl Android Tests
+      run: ./android/gradlew -p ./android :hello_sdl_android:build
+      
+    - name: Sdl JavaSE Tests
+      run: ./javaSE/gradlew -p ./javaSE test
+      
+    - name: Hello Sdl JavaSE Tests
+      run: ./hello_sdl_java/gradlew -p ./hello_sdl_java test
+    
+    - name: Sdl JavaEE Tests
+      run: ./javaEE/gradlew -p ./javaEE test
+      
+    - name: Codecov	
+      uses: codecov/codecov-action@v1.0.4	
+      with:	
+        token: ${{secrets.CODECOV_TOKEN}}
+        yml: ./codecov.yml
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 625caaa52..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-language: android
-jdk: oraclejdk8
-dist: trusty
-sudo: false
-android:
-  components:
-    # use the latest revision of Android SDK Tools
-    - tools
-    - tools
-    - platform-tools
-    - ndk-bundle
-
-    # The BuildTools version used by your project
-    - build-tools-28.0.3
-
-    # The SDK version used to compile your project
-    - android-28
-    - android-27
-    - android-26
-    - android-22 #For emulator
-    # Specify at least one system image,
-    # if you need to run emulator(s) during your tests
-    - sys-img-armeabi-v7a-android-22
-    # - sys-img-x86-android-26
-
-    # Android Support Repos
-    - extra-android-m2repository
-    - extra-google-m2repository
-
-licenses:
-    - 'android-sdk-preview-license-.+'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
-
-env:
-  global:
-   # install timeout in minutes (2 minutes by default)
-    - ADB_INSTALL_TIMEOUT=4
-
-# Emulator Management: Create, Start and Wait
-before_script:
-  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
-  - emulator -avd test -no-skin -no-audio -no-window &
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
-
-script:
-  - android list target
-  - ./android/gradlew -p ./android :sdl_android:connectedCheck
-  - ./android/gradlew -p ./android :hello_sdl_android:test
-  - ./javaSE/gradlew -p ./javaSE test
-  - ./hello_sdl_java/gradlew -p ./hello_sdl_java test
-  - ./javaEE/gradlew -p ./javaEE test
-
-before_install:
-    - echo yes | sdkmanager "build-tools;28.0.3"
-
-after_success:
-    - bash <(curl -s https://codecov.io/bash)
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
index bb257b915..d59ca1740 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
@@ -113,7 +113,7 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 					return;
 				}
 				VideoStreamingCapability capability = (VideoStreamingCapability) internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING);
-				if(capability != null && capability.getIsHapticSpatialDataSupported()){
+				if(capability != null && Boolean.TRUE.equals(capability.getIsHapticSpatialDataSupported())){
 					hapticManager = new HapticInterfaceManager(internalInterface);
 				}
 				startEncoder();
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index 4a0668617..5c886ff67 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -8368,7 +8368,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 				return;

 			}

 			VideoStreamingCapability capability = (VideoStreamingCapability)_systemCapabilityManager.getCapability(SystemCapabilityType.VIDEO_STREAMING);

-			if(capability != null && capability.getIsHapticSpatialDataSupported()){

+			if(capability != null && Boolean.TRUE.equals(capability.getIsHapticSpatialDataSupported())){

 				hapticManager = new HapticInterfaceManager(internalInterface);

 			}

 

diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 000000000..baf389db3
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,29 @@
+codecov:
+  require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+  status:
+    project:
+      default:
+        target: 40%
+    patch:
+      default:
+        target: 40%
+    changes: no
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "reach,diff,flags,tree"
+  behavior: default
+  require_changes: no