Merge branch 'develop' into feature/fix_scm_package

# Conflicts:
#	base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
#	base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
#	base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java

Author: bilal-alsharifi

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java

@@ -1,6 +1,7 @@
 package com.smartdevicelink.managers;
 
 import android.content.Context;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.livio.taskmaster.Taskmaster;
@@ -18,7 +19,6 @@
 import com.smartdevicelink.proxy.rpc.TemplateColorScheme;
 import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
 import com.smartdevicelink.proxy.rpc.enums.Language;
-import com.smartdevicelink.proxy.rpc.enums.Result;
 import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener;
 import com.smartdevicelink.test.TestValues;
@@ -403,10 +403,6 @@ public void onFinished() {
 				listenerCalledCounter++;
 			}
 
-			@Override
-			public void onError(int correlationId, Result resultCode, String info) {
-			}
-
 			@Override
 			public void onResponse(int correlationId, RPCResponse response) {
 			}

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java

@@ -72,10 +72,9 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
 			RPCRequest message = (RPCRequest) args[0];
 			if (message instanceof PutFile) {
 				int correlationId = message.getCorrelationID();
-				Result resultCode = Result.REJECTED;
-				PutFileResponse putFileResponse = new PutFileResponse();
-				putFileResponse.setSuccess(false);
-				message.getOnRPCResponseListener().onError(correlationId, resultCode, "Binary data empty");
+				PutFileResponse putFileResponse = new PutFileResponse(false, Result.REJECTED);
+				putFileResponse.setInfo("Binary data empty");
+				message.getOnRPCResponseListener().onResponse(correlationId, putFileResponse);
 			}
 			return null;
 		}
@@ -88,13 +87,12 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
 			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
 			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
 			if (rpcs.get(0) instanceof PutFile) {
-				Result resultCode = Result.REJECTED;
 				for (RPCRequest message : rpcs) {
 					int correlationId = message.getCorrelationID();
 					listener.addCorrelationId(correlationId);
-					PutFileResponse putFileResponse = new PutFileResponse();
-					putFileResponse.setSuccess(true);
-					listener.onError(correlationId, resultCode, "Binary data empty");
+					PutFileResponse putFileResponse = new PutFileResponse(false, Result.REJECTED);
+					putFileResponse.setInfo("Binary data empty");
+					listener.onResponse(correlationId, putFileResponse);
 				}
 				listener.onFinished();
 			}
@@ -197,13 +195,12 @@ public Void answer(InvocationOnMock invocation) {
 			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
 			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
 			if (rpcs.get(0) instanceof DeleteFile) {
-				Result resultCode = Result.REJECTED;
 				for (RPCRequest message : rpcs) {
 					int correlationId = message.getCorrelationID();
 					listener.addCorrelationId(correlationId);
-					DeleteFileResponse deleteFileResponse = new DeleteFileResponse();
-					deleteFileResponse.setSuccess(true);
-					listener.onError(correlationId, resultCode, "Binary data empty");
+					DeleteFileResponse deleteFileResponse = new DeleteFileResponse(false, Result.REJECTED);
+					deleteFileResponse.setInfo("Binary data empty");
+					listener.onResponse(correlationId, deleteFileResponse);
 				}
 				listener.onFinished();
 			}
@@ -218,7 +215,6 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
 			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
 			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
 			if (rpcs.get(0) instanceof PutFile) {
-				Result resultCode = Result.REJECTED;
 				boolean flip = false;
 				for (RPCRequest message : rpcs) {
 					int correlationId = message.getCorrelationID();
@@ -231,7 +227,9 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
 					} else {
 						flip = true;
 						putFileResponse.setSuccess(false);
-						listener.onError(correlationId, resultCode, "Binary data empty");
+						putFileResponse.setResultCode(Result.REJECTED);
+						putFileResponse.setInfo("Binary data empty");
+						listener.onResponse(correlationId, putFileResponse);
 					}
 				}
 				listener.onFinished();

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java

@@ -61,9 +61,9 @@ public Void answer(InvocationOnMock invocation) {
             Object[] args = invocation.getArguments();
             RPCRequest message = (RPCRequest) args[0];
             if(message instanceof SubscribeButton){
-                SubscribeButtonResponse subscribeButtonResponse = new SubscribeButtonResponse();
-                subscribeButtonResponse.setSuccess(false);
-                message.getOnRPCResponseListener().onError(message.getCorrelationID(), Result.GENERIC_ERROR, "Fail");
+                SubscribeButtonResponse subscribeButtonResponse = new SubscribeButtonResponse(false, Result.GENERIC_ERROR);
+                subscribeButtonResponse.setInfo("Fail");
+                message.getOnRPCResponseListener().onResponse(message.getCorrelationID(), subscribeButtonResponse);
             }
             return null;
         }

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java

@@ -15,6 +15,7 @@
 import com.smartdevicelink.proxy.SdlProxyBuilder;
 import com.smartdevicelink.proxy.SdlProxyConfigurationResources;
 import com.smartdevicelink.proxy.interfaces.IProxyListenerALM;
+import com.smartdevicelink.proxy.rpc.GenericResponse;
 import com.smartdevicelink.proxy.rpc.Show;
 import com.smartdevicelink.proxy.rpc.ShowResponse;
 import com.smartdevicelink.proxy.rpc.Speak;
@@ -228,16 +229,15 @@ public void onFinished() {
                 onFinishedListenerCounter++;
             }
 
-            @Override
-            public void onError(int correlationId, Result resultCode, String info) {
-                onErrorListenerCounter++;
-                remainingRequestsExpected--;
-            }
-
             @Override
             public void onResponse(int correlationId, RPCResponse response) {
-                onResponseListenerCounter++;
-                remainingRequestsExpected--;
+                if (response.getSuccess()) {
+                    onResponseListenerCounter++;
+                    remainingRequestsExpected--;
+                } else {
+                    onErrorListenerCounter++;
+                    remainingRequestsExpected--;
+                }
             }
         };
         try {
@@ -280,7 +280,7 @@ public void onResponse(int correlationId, RPCResponse response) {
                 while (rpcsTempList.size() != 0){
                     RPCRequest request = rpcsTempList.remove(0);
                     if (request instanceof Speak) {
-                        requestsMap.get(request).onError(request.getCorrelationID(), Result.DISALLOWED, "ERROR");
+                        requestsMap.get(request).onResponse(request.getCorrelationID(), new GenericResponse(false, Result.DISALLOWED));
                     } else if (request instanceof Show) {
                         requestsMap.get(request).onResponse(request.getCorrelationID(), new ShowResponse(true, Result.SUCCESS));
                     }