Undo some deprecations

3 files changed, 11 insertions, 30 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java
index 64f8b18c4..06d0aeef0 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java
@@ -181,6 +181,8 @@ public class RPCGenericTests {
                                     paramName = "sdlMsgVersion";
                                 } else if (paramName.equals("hmiPermissions")){
                                     paramName = "HMIPermissions";
+                                } else if (paramName.equals("resolution")){
+                                    paramName = "imageResolution";
                                 }
 
                                 setterMethodName = "set" + paramName.substring(0, 1).toUpperCase() + paramName.substring(1);
@@ -211,8 +213,6 @@ public class RPCGenericTests {
                                     setterMethodName = "setInteractionFunctionID";
                                 } else if (rpcName.equals("NavigationCapability") && setterMethodName.equals("setGetWayPointsEnabled")) {
                                     setterMethodName = "setWayPointsEnabled";
-                                } else if (rpcName.equals("HMICapabilities")) {
-                                    setterMethodName += "Available";
                                 } else if (setterMethodName.equals("setFuelLevel_State")) {
                                     setterMethodName = "setFuelLevelState";
                                 } else if (rpcName.equals("SystemCapability") && !setterMethodName.equals("setSystemCapabilityType")) {
@@ -286,6 +286,10 @@ public class RPCGenericTests {
                                     setterMethodName = "setTPMS";
                                 } else if (rpcName.equals("VehicleDataResult") && setterMethodName.equals("setOemCustomDataType")) {
                                     setterMethodName = "setOEMCustomVehicleDataType";
+                                } else if (rpcName.equals("HMICapabilities") && setterMethodName.equals("setDisplays")) {
+                                    setterMethodName = "setDisplaysCapabilityAvailable";
+                                } else if (rpcName.equals("HMICapabilities")) {
+                                    setterMethodName += "Available";
                                 }
 
                                 // -------------------------------------------------------------------------------------------------------------
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
index 652815640..fd5ae76d5 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
@@ -128,18 +128,7 @@ public class HMICapabilities extends RPCStruct{
         return this;
     }
 
-    @Deprecated
 	public boolean isDisplaysCapabilityAvailable(){
-		return isDisplaysAvailable();
-	}
-
-	@Deprecated
-	public HMICapabilities setDisplaysCapabilityAvailable( Boolean available) {
-        setValue(KEY_DISPLAYS, available);
-        return this;
-    }
-
-	public boolean isDisplaysAvailable() {
 		Object available = getValue(KEY_DISPLAYS);
 		if (available == null) {
 			return false;
@@ -147,10 +136,10 @@ public class HMICapabilities extends RPCStruct{
 		return (Boolean) available;
 	}
 
-	public HMICapabilities setDisplaysAvailable(Boolean available) {
-		setValue(KEY_DISPLAYS, available);
-		return this;
-	}
+	public HMICapabilities setDisplaysCapabilityAvailable( Boolean available) {
+        setValue(KEY_DISPLAYS, available);
+        return this;
+    }
 
 	public boolean isSeatLocationAvailable(){
 		Object available = getValue(KEY_SEAT_LOCATION);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
index 545d659e3..fd644cb40 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
@@ -102,25 +102,13 @@ public class ScreenParams extends RPCStruct {
     }

 

     @SuppressWarnings("unchecked")

-    @Deprecated

     public ImageResolution getImageResolution() {

         return (ImageResolution) getObject(ImageResolution.class, KEY_RESOLUTION);

-    }

-    @Deprecated

+    } 

     public ScreenParams setImageResolution(@NonNull ImageResolution resolution) {

         setValue(KEY_RESOLUTION, resolution);

         return this;

     }

-

-    public ImageResolution getResolution() {

-        return (ImageResolution) getObject(ImageResolution.class, KEY_RESOLUTION);

-    }

-

-    public ScreenParams setResolution(@NonNull ImageResolution resolution) {

-        setValue(KEY_RESOLUTION, resolution);

-        return this;

-    }

-

     @SuppressWarnings("unchecked")

     public TouchEventCapabilities getTouchEventAvailable() {

     	return (TouchEventCapabilities) getObject(TouchEventCapabilities.class, KEY_TOUCH_EVENT_AVAILABLE);