From e8a335abcee4f4177a9feb014381ad3f0c2e6c6b Mon Sep 17 00:00:00 2001
From: BrettyWhite <geekman3454@protonmail.com>
Date: Wed, 9 Oct 2019 15:53:52 -0400
Subject: prevent security from initializing twice in sdlsession

---
 .../main/java/com/smartdevicelink/SdlConnection/SdlSession.java   | 8 ++++++--
 .../main/java/com/smartdevicelink/SdlConnection/SdlSession2.java  | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
index 58fa8d576..33f9d885e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
@@ -107,6 +107,7 @@ public class SdlSession implements ISdlConnectionListener, IHeartbeatMonitorList
     StreamPacketizer mAudioPacketizer = null;
     SdlEncoder mSdlEncoder = null;
     VirtualDisplayEncoder virtualDisplayEncoder = null;
+    boolean sdlSecurityInitializing = false;
 
     public static SdlSession createSession(byte wiproVersion, ISdlConnectionListener listener, BaseTransportConfig btConfig) {
 
@@ -450,9 +451,12 @@ public class SdlSession implements ISdlConnectionListener, IHeartbeatMonitorList
                 if (!serviceList.contains(serviceType))
                     serviceList.add(serviceType);
 
-                sdlSecurity.initialize();
+                if (!sdlSecurityInitializing) {
+                    sdlSecurityInitializing = true;
+                    sdlSecurity.initialize();
+                    return;
+                }
             }
-            return;
         }
         _sdlConnection.startService(serviceType, sessionID, isEncrypted);
     }
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 f4554b913..14258cbfe 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,7 +64,6 @@ public class SdlSession2 extends SdlSession implements ISdlProtocol{
     WeakReference<Context> contextWeakReference;
     MediaStreamingStatus mediaStreamingStatus;
     boolean requiresAudioSupport = false;
-    boolean sdlSecurityInitializing = false;
 
     @SuppressWarnings("SameReturnValue")
     @Deprecated
-- 
cgit v1.2.1