Merge branch 'develop' into bugfix/issue_1865_service_leak

Author: JulianKast

.github/workflows/android.yml

@@ -3,7 +3,7 @@ name: GitHub CI
 on: [push, pull_request, workflow_dispatch]
 
 jobs:
-  test:
+  test_Android:
     runs-on: macOS-latest
     steps:
 
@@ -15,7 +15,7 @@ jobs:
     - name: Setup JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
 
     - name: Sdl Android Tests
       # For more info, please check out: https://github.com/marketplace/actions/android-emulator-runner
@@ -26,6 +26,25 @@ jobs:
 
     - name: Hello Sdl Android Tests
       run: ./android/gradlew -p ./android/hello_sdl_android test
+
+    - name: Codecov	
+      uses: codecov/codecov-action@v1.0.13
+      with:
+        yml: ./codecov.yml
+
+  test_Java:
+    runs-on: macOS-latest
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Setup JDK
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
 
     - name: Sdl JavaSE Tests
       run: ./javaSE/gradlew -p ./javaSE/javaSE test
@@ -36,7 +55,3 @@ jobs:
     - name: Sdl JavaEE Tests
       run: ./javaEE/gradlew -p ./javaEE/javaEE test
 
-    - name: Codecov	
-      uses: codecov/codecov-action@v1.0.13
-      with:
-        yml: ./codecov.yml

android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
 
 
         // NOTE: Do not place your application dependencies here; they belong

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

android/sdl_android/build.gradle

@@ -55,8 +55,8 @@ dependencies {
     androidTestImplementation 'org.mockito:mockito-core:3.0.0'
     androidTestImplementation 'org.mockito:mockito-android:3.0.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
 }
 
 buildscript {

android/sdl_android/src/androidTest/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest package="com.smartdevicelink"
+<manifest package="com.smartdevicelink.test"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-sdk android:minSdkVersion="16" />
@@ -16,7 +16,7 @@
 
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
-        <activity android:name=".managers.lockscreen.SDLLockScreenActivity"/>
+        <activity android:name=".managers.lockscreen.SDLLockScreenActivity" />
     </application>
 
 </manifest>

android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java

@@ -2939,6 +2939,9 @@ protected PacketWriteTask getNextTask(TransportType transportType) {
         long currentPriority = -Long.MAX_VALUE, peekWeight;
         synchronized (REGISTERED_APPS_LOCK) {
             PacketWriteTask peekTask;
+            if (registeredApps == null) {
+                return null;
+            }
             for (RegisteredApp app : registeredApps.values()) {
                 peekTask = app.peekNextTask(transportType);
                 if (peekTask != null) {