Make the order of the params in the RPC constructors match the RPC spec

7 files changed, 30 insertions, 20 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java
index 991965e5c..f2644160e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java
@@ -30,12 +30,12 @@ public class ButtonPressResponse extends RPCResponse {
     }
     /**
      * Constructs a new ButtonPressResponse object
-     * @param success whether the request is successfully processed
      * @param resultCode whether the request is successfully processed
+     * @param success whether the request is successfully processed
      */
-    public ButtonPressResponse(@NonNull Boolean success, @NonNull Result resultCode) {
+    public ButtonPressResponse(@NonNull Result resultCode, @NonNull Boolean success) {
         this();
-        setSuccess(success);
         setResultCode(resultCode);
+        setSuccess(success);
     }
 }
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
index 557d91d12..88d663805 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
@@ -33,15 +33,16 @@ public class GetInteriorVehicleDataResponse extends RPCResponse {
 
 	/**
 	 * Constructs a new GetInteriorVehicleDataResponse object
-	 * @param success whether the request is successfully processed
-	 * @param resultCode whether the request is successfully processed
 	 * @param moduleData
+	 * @param resultCode whether the request is successfully processed
+	 * @param success whether the request is successfully processed
+
 	 */
-	public GetInteriorVehicleDataResponse(@NonNull Boolean success, @NonNull Result resultCode, @NonNull ModuleData moduleData) {
+	public GetInteriorVehicleDataResponse( @NonNull ModuleData moduleData, @NonNull Result resultCode, @NonNull Boolean success) {
 		this();
-		setSuccess(success);
-		setResultCode(resultCode);
 		setModuleData(moduleData);
+		setResultCode(resultCode);
+		setSuccess(success);
 	}
 
 	/**
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
index 4f38e95a5..afcc8c48c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
@@ -35,15 +35,15 @@ public class GetSystemCapabilityResponse extends RPCResponse {
 
     /**
      * Constructs a new GetSystemCapabilityResponse object
-     * @param success whether the request is successfully processed
-     * @param resultCode whether the request is successfully processed
      * @param systemCapability SystemCapability object
+     * @param resultCode whether the request is successfully processed
+     * @param success whether the request is successfully processed
      */
-    public GetSystemCapabilityResponse(@NonNull Boolean success, @NonNull Result resultCode, @NonNull SystemCapability systemCapability) {
+    public GetSystemCapabilityResponse(@NonNull SystemCapability systemCapability, @NonNull Result resultCode, @NonNull Boolean success) {
         this();
-        setSuccess(success);
-        setResultCode(resultCode);
         setSystemCapability(systemCapability);
+        setResultCode(resultCode);
+        setSuccess(success);
     }
 
     /**
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
index 9bfc76538..efe1c184b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
@@ -70,6 +70,7 @@ public class OnPermissionsChange extends RPCNotification {
 	 */

 	public OnPermissionsChange(@NonNull List<PermissionItem> permissionItem) {

 		this();

+		setPermissionItem(permissionItem);

 	}

 	/**

      * <p>Returns List<PermissionItem> object describing change in permissions for a given set of RPCs</p>

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
index cadb6fd38..79d7c9546 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
@@ -66,4 +66,12 @@ public class PresetBankCapabilities extends RPCStruct {
     public Boolean onScreenPresetsAvailable() {

     	return getBoolean(KEY_ON_SCREEN_PRESETS_AVAILABLE);

     }

+

+    /**

+     * Defines, if Onscreen custom presets are available.

+     * @return if Onscreen custom presets are available

+     */

+    public Boolean getOnScreenPresetsAvailable() {

+        return getBoolean(KEY_ON_SCREEN_PRESETS_AVAILABLE);

+    }

 }

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
index b74523894..837b36fc7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
@@ -32,15 +32,15 @@ public class SetInteriorVehicleDataResponse extends RPCResponse {
 
 	/**
 	 * Constructs a new SetInteriorVehicleDataResponse object
+	 * @param moduleData
 	 * @param success whether the request is successfully processed
 	 * @param resultCode whether the request is successfully processed
-	 * @param moduleData
 	 */
-	public SetInteriorVehicleDataResponse(@NonNull Boolean success, @NonNull Result resultCode, @NonNull ModuleData moduleData) {
+	public SetInteriorVehicleDataResponse(@NonNull ModuleData moduleData, @NonNull Result resultCode, @NonNull Boolean success) {
 		this();
-		setSuccess(success);
-		setResultCode(resultCode);
 		setModuleData(moduleData);
+		setResultCode(resultCode);
+		setSuccess(success);
 	}
 
 	/**
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java
index be4d1888c..0ddfec2ef 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java
@@ -21,13 +21,13 @@ public class VideoStreamingFormat extends RPCStruct {
 
 	/**
 	 * Create the VideoStreamingFormat object
-	 * @param codec The codec used
 	 * @param protocol The protocol used
+	 * @param codec The codec used
 	 */
-	public VideoStreamingFormat(@NonNull VideoStreamingCodec codec, @NonNull VideoStreamingProtocol protocol){
+	public VideoStreamingFormat(@NonNull VideoStreamingProtocol protocol, @NonNull VideoStreamingCodec codec){
 		this();
-		setCodec(codec);
 		setProtocol(protocol);
+		setCodec(codec);
 	}
 
 	public void setProtocol(@NonNull VideoStreamingProtocol protocol){