get notification listeners in manager from LCM

Author: RHenigan

android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java

@@ -114,12 +114,12 @@ void initializeProxy() {
 
     @Override
     void cycleProxy(SdlDisconnectedReason disconnectedReason) {
-        cleanProxy();
-        initializeProxy();
         if (!SdlDisconnectedReason.LEGACY_BLUETOOTH_MODE_ENABLED.equals(disconnectedReason) && !SdlDisconnectedReason.PRIMARY_TRANSPORT_CYCLE_REQUEST.equals(disconnectedReason)) {
             //We don't want to alert higher if we are just cycling for legacy bluetooth
             onClose("Sdl Proxy Cycled", new SdlException("Sdl Proxy Cycled", SdlExceptionCause.SDL_PROXY_CYCLED), disconnectedReason);
         }
+        cleanProxy();
+        initializeProxy();
         if (session != null) {
             try {
                 session.startSession();

base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java

@@ -71,12 +71,14 @@
 import org.json.JSONException;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
 import java.util.Vector;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 abstract class BaseSdlManager {
 
@@ -145,6 +147,19 @@ public void onProxyClosed(LifecycleManager lifeCycleManager, String info, Except
             Log.i(TAG, "Proxy is closed.");
             if (reason == null || !reason.equals(SdlDisconnectedReason.LANGUAGE_CHANGE)) {
                 dispose();
+            } else {
+                onRPCNotificationListeners = new HashMap<>();
+                HashMap<Integer, CopyOnWriteArrayList<OnRPCNotificationListener>> rpcNotificationListeners = lifeCycleManager.getOnRPCNotificationListeners();
+                for (Integer key : rpcNotificationListeners.keySet()) {
+                    if (rpcNotificationListeners.get(key) != null) {
+                        for (OnRPCNotificationListener listener : rpcNotificationListeners.get(key)) {
+                            String functionName = FunctionID.getFunctionName(key);
+                            if (functionName != null) {
+                                onRPCNotificationListeners.put(FunctionID.getEnumForString(functionName), listener);
+                            }
+                        }
+                    }
+                }
             }
         }
 
@@ -311,6 +326,7 @@ void handleQueuedNotifications() {
             //Set variables to null that are no longer needed
             queuedNotifications = null;
             queuedNotificationListener = null;
+            onRPCNotificationListeners = null;
         }
     }
 

base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java

@@ -640,6 +640,10 @@ private void addOnRPCNotificationListener(FunctionID notificationId, OnRPCNotifi
         }
     }
 
+    public HashMap<Integer, CopyOnWriteArrayList<OnRPCNotificationListener>> getOnRPCNotificationListeners() {
+        return rpcNotificationListeners;
+    }
+
     private boolean removeOnRPCNotificationListener(FunctionID notificationId, OnRPCNotificationListener listener) {
         synchronized (ON_NOTIFICATION_LISTENER_LOCK) {
             if (rpcNotificationListeners != null