diff options
| author | Robert Henigan <robert.henigan@livio.io> | 2020-09-21 13:18:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-21 13:18:44 -0400 |
| commit | f2ad7c91daf8be6dd13a8414948dcc63b832fb10 (patch) | |
| tree | 14d29de73bbc3cc3b29f80be7177dd0cb16be1bd | |
| parent | 925d9c5b6e0c41fd5af166aa45bdd72125585ad8 (diff) | |
| parent | 52750034d3b5ff7f0cf715c491b778161890ca73 (diff) | |
| download | sdl_android-f2ad7c91daf8be6dd13a8414948dcc63b832fb10.tar.gz | |
Merge pull request #1508 from smartdevicelink/feature/hmi_capabilities_fix
Fix inconsistency with HMICapabilities API names
3 files changed, 6 insertions, 4 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java index b9e1a5403..edf446b3c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java +++ b/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(); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java index 4ab264787..ee65f52bb 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java @@ -24,7 +24,7 @@ public class HMICapabilitiesTests extends TestCase { 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); } /** 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 c7c8d659b..63be6aef0 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java @@ -172,11 +172,11 @@ public class HMICapabilities extends RPCStruct { /** * 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; } |