Rename callbacks to better reflect events

Author: joeygrover

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Livio, Inc.
+ * Copyright (c) 2019-2020 Livio, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,6 @@
  * The lifecycle manager creates a central point for all SDL session logic to converge. It should only be used by
  * the library itself. Usage outside the library is not permitted and will not be protected for in the future.
  *
- * @author Bilal Alsharifi.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class LifecycleManager extends BaseLifecycleManager {
@@ -153,8 +152,8 @@ void setSdlSecurityStaticVars() {
     }
 
     @Override
-    void onProtocolSessionStarted(SessionType sessionType) {
-        super.onProtocolSessionStarted(sessionType);
+    void onServiceStarted(SessionType sessionType) {
+        super.onServiceStarted(sessionType);
         if (sessionType.eq(SessionType.NAV)) {
             videoServiceStartResponseReceived = true;
             videoServiceStartResponse = true;
@@ -174,17 +173,17 @@ void onTransportDisconnected(String info, boolean availablePrimary, BaseTranspor
     }
 
     @Override
-    void onProtocolSessionStartedNACKed(SessionType sessionType) {
-        super.onProtocolSessionStartedNACKed(sessionType);
+    void onStartServiceNACKed(SessionType sessionType) {
+        super.onStartServiceNACKed(sessionType);
         if (sessionType.eq(SessionType.NAV)) {
             videoServiceStartResponseReceived = true;
             videoServiceStartResponse = false;
         }
     }
 
     @Override
-    void onProtocolSessionEnded(SessionType sessionType) {
-        super.onProtocolSessionEnded(sessionType);
+    void onServiceEnded(SessionType sessionType) {
+        super.onServiceEnded(sessionType);
         if (sessionType.eq(SessionType.NAV)) {
             videoServiceEndResponseReceived = true;
             videoServiceEndResponse = true;
@@ -195,8 +194,8 @@ void onProtocolSessionEnded(SessionType sessionType) {
     }
 
     @Override
-    void onProtocolSessionEndedNACKed(SessionType sessionType) {
-        super.onProtocolSessionEndedNACKed(sessionType);
+    void onStopServiceNACKed(SessionType sessionType) {
+        super.onStopServiceNACKed(sessionType);
         if (sessionType.eq(SessionType.NAV)) {
             videoServiceEndResponseReceived = true;
             videoServiceEndResponse = false;

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

@@ -903,24 +903,24 @@ public void onProtocolMessageReceived(ProtocolMessage msg) {
 
         @Override
         public void onProtocolSessionStartedNACKed(SessionType sessionType, byte sessionID, byte version, String correlationID, List<String> rejectedParams) {
-            Log.w(TAG, sessionType + " onProtocolSessionStartedNACKed " + sessionID + " RejectedParams: " + rejectedParams);
-            BaseLifecycleManager.this.onProtocolSessionStartedNACKed(sessionType);
+            Log.w(TAG, sessionType.getName() + " onProtocolSessionStartedNACKed " + sessionID + " RejectedParams: " + rejectedParams);
+            BaseLifecycleManager.this.onStartServiceNACKed(sessionType);
         }
 
         @Override
         public void onProtocolSessionStarted(SessionType sessionType, byte sessionID, byte version, String correlationID, int hashID, boolean isEncrypted) {
             Log.i(TAG, "on protocol session started");
-            BaseLifecycleManager.this.onProtocolSessionStarted(sessionType);
+            BaseLifecycleManager.this.onServiceStarted(sessionType);
         }
 
         @Override
         public void onProtocolSessionEnded(SessionType sessionType, byte sessionID, String correlationID) {
-            BaseLifecycleManager.this.onProtocolSessionEnded(sessionType);
+            BaseLifecycleManager.this.onServiceEnded(sessionType);
         }
 
         @Override
         public void onProtocolSessionEndedNACKed(SessionType sessionType, byte sessionID, String correlationID) {
-            BaseLifecycleManager.this.onProtocolSessionEndedNACKed(sessionType);
+            BaseLifecycleManager.this.onStopServiceNACKed(sessionType);
         }
 
         @Override
@@ -1294,7 +1294,7 @@ void initialize() {
         setupInternalRpcListeners();
     }
 
-    void onProtocolSessionStarted(SessionType sessionType) {
+    void onServiceStarted(SessionType sessionType) {
         if (sessionType != null) {
             if (minimumProtocolVersion != null && minimumProtocolVersion.isNewerThan(getProtocolVersion()) == 1) {
                 Log.w(TAG, String.format("Disconnecting from head unit, the configured minimum protocol version %s is greater than the supported protocol version %s", minimumProtocolVersion, getProtocolVersion()));
@@ -1341,13 +1341,13 @@ void onProtocolSessionStarted(SessionType sessionType) {
     void onTransportDisconnected(String info, boolean availablePrimary, BaseTransportConfig transportConfig) {
     }
 
-    void onProtocolSessionStartedNACKed(SessionType sessionType) {
+    void onStartServiceNACKed(SessionType sessionType) {
     }
 
-    void onProtocolSessionEnded(SessionType sessionType) {
+    void onServiceEnded(SessionType sessionType) {
     }
 
-    void onProtocolSessionEndedNACKed(SessionType sessionType) {
+    void onStopServiceNACKed(SessionType sessionType) {
     }
 
     void startVideoService(boolean encrypted, VideoStreamingParameters parameters) {