Revert "Pass NotificationListeners OnProxyClose"

This reverts commit ee38da7.

Author: RHenigan

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

@@ -71,7 +71,6 @@
 import org.json.JSONException;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
@@ -131,15 +130,6 @@ public void onProxyConnected(LifecycleManager lifeCycleManager) {
             }
         }
 
-        @Override
-        @Deprecated
-        public void onProxyClosed(LifecycleManager lifeCycleManager, String info, Exception e, SdlDisconnectedReason reason) {
-            Log.i(TAG, "Proxy is closed.");
-            if (reason == null || !reason.equals(SdlDisconnectedReason.LANGUAGE_CHANGE)) {
-                dispose();
-            }
-        }
-
         @Override
         public void onServiceStarted(SessionType sessionType) {
 
@@ -151,12 +141,11 @@ public void onServiceEnded(SessionType sessionType) {
         }
 
         @Override
-        public void onProxyClosed(LifecycleManager lifeCycleManager, String info, Exception e, SdlDisconnectedReason reason, HashMap rpcNotificationListeners) {
+        public void onProxyClosed(LifecycleManager lifeCycleManager, String info, Exception e, SdlDisconnectedReason reason) {
             Log.i(TAG, "Proxy is closed.");
             if (reason == null || !reason.equals(SdlDisconnectedReason.LANGUAGE_CHANGE)) {
                 dispose();
             }
-            onRPCNotificationListeners = rpcNotificationListeners;
         }
 
         @Override
@@ -322,7 +311,6 @@ 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

@@ -329,7 +329,7 @@ public OnHMIStatus getCurrentHMIStatus() {
     void onClose(String info, Exception e, SdlDisconnectedReason reason) {
         Log.i(TAG, "onClose");
         if (lifecycleListener != null) {
-            lifecycleListener.onProxyClosed((LifecycleManager) this, info, e, reason, rpcNotificationListeners);
+            lifecycleListener.onProxyClosed((LifecycleManager) this, info, e, reason);
         }
     }
 
@@ -1155,11 +1155,8 @@ public void startRPCEncryption() {
     public interface LifecycleListener {
         void onProxyConnected(LifecycleManager lifeCycleManager);
 
-        @Deprecated
         void onProxyClosed(LifecycleManager lifeCycleManager, String info, Exception e, SdlDisconnectedReason reason);
 
-        void onProxyClosed(LifecycleManager lifeCycleManager, String info, Exception e, SdlDisconnectedReason reason, HashMap rpcNotificationListeners);
-
         void onServiceStarted(SessionType sessionType);
 
         void onServiceEnded(SessionType sessionType);