Call sdlSecurity.initialize() only when the first encrypted service starts

1 files changed, 6 insertions, 2 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession2.java b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession2.java
index b9b9a5e40..f4554b913 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession2.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession2.java
@@ -64,6 +64,7 @@ public class SdlSession2 extends SdlSession implements ISdlProtocol{
     WeakReference<Context> contextWeakReference;
     MediaStreamingStatus mediaStreamingStatus;
     boolean requiresAudioSupport = false;
+    boolean sdlSecurityInitializing = false;
 
     @SuppressWarnings("SameReturnValue")
     @Deprecated
@@ -154,9 +155,12 @@ public class SdlSession2 extends SdlSession implements ISdlProtocol{
                 if (!serviceList.contains(serviceType))
                     serviceList.add(serviceType);
 
-                sdlSecurity.initialize();
+                if (!sdlSecurityInitializing) {
+                    sdlSecurityInitializing = true;
+                    sdlSecurity.initialize();
+                    return;
+                }
             }
-            return;
         }
         sdlProtocol.startService(serviceType, sessionID, isEncrypted);
     }