Merge pull request #1508 from smartdevicelink/feature/hmi_capabilities_fix

Fix inconsistency with HMICapabilities API names

Author: Robert Henigan

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java

@@ -425,6 +425,8 @@ public class TestValues {
     public static final LightControlData GENERAL_LIGHTCONTROLDATA = new LightControlData();
     public static final HMISettingsControlData GENERAL_HMISETTINGSCONTROLDATA = new HMISettingsControlData();
     public static final DynamicUpdateCapabilities GENERAL_DYNAMICUPDATECAPABILITIES = new DynamicUpdateCapabilities();
+    public static final WindowState GENERAL_WINDOWSTATE = new WindowState();
+
 
     public static final VehicleDataResult GENERAL_OEM_CUSTOM_VEHICLE_DATA = new VehicleDataResult();
     public static final TemplateConfiguration GENERAL_TEMPLATE_CONFIGURATION = new TemplateConfiguration();

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java

@@ -24,7 +24,7 @@ public void setUp() {
         msg.setNavigationAvilable(TestValues.GENERAL_BOOLEAN);
         msg.setPhoneCallAvilable(TestValues.GENERAL_BOOLEAN);
         msg.setVideoStreamingAvailable(TestValues.GENERAL_BOOLEAN);
-        msg.setDriverDistraction(TestValues.GENERAL_BOOLEAN);
+        msg.setDriverDistractionAvailable(TestValues.GENERAL_BOOLEAN);
     }
 
     /**

base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java

@@ -172,11 +172,11 @@ public HMICapabilities setSeatLocationAvailable(Boolean available) {
     /**
      * Sets the driverDistraction.
      *
-     * @param driverDistraction Availability of driver distraction capability. True: Available, False: Not Available
+     * @param available Availability of driver distraction capability. True: Available, False: Not Available
      * @since SmartDeviceLink 7.0.0
      */
-    public HMICapabilities setDriverDistraction(Boolean driverDistraction) {
-        setValue(KEY_DRIVER_DISTRACTION, driverDistraction);
+    public HMICapabilities setDriverDistractionAvailable(Boolean available) {
+        setValue(KEY_DRIVER_DISTRACTION, available);
         return this;
     }