Merge pull request #1139 from smartdevicelink/hotfix/fix_vr_optional4.9.1

Hotfix 4.9.1 - Fix ChoiceSetManager issue with HUs that require VR for choices 

5 files changed, 9 insertions, 29 deletions

diff --git a/.travis.yml b/.travis.yml
index 96bbd4a27..51e3dfe7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: android
 jdk: oraclejdk8
+dist: trusty
 sudo: false
 android:
   components:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cabd706d..40d356106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,5 @@
-# 4.9.0 Release Notes
+# 4.9.1 Release Notes
 
-## Feature
+### Hotfix
 
-- [[SDL 0157] Mobile Choice Set Manager](https://github.com/smartdevicelink/sdl_java_suite/issues/764)
-- [[SDL 0155] Mobile Menu Manager](https://github.com/smartdevicelink/sdl_java_suite/issues/730)
-- [[SDL 0210]-Mobile Manager Dynamic Menu Cell Updating ](https://github.com/smartdevicelink/sdl_java_suite/issues/961)
-- [[SDL 0232] Added Pushing Buffer Support to AudioStreamManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1075)
-- [Library will dynamically check if head unit requires VR synonyms for Choice items](https://github.com/smartdevicelink/sdl_java_suite/issues/941)
-- [VideoStreamingManager now fully supports multi-touch events](https://github.com/smartdevicelink/sdl_java_suite/issues/972)
-
-
-
-## Bug Fixes
-
-- [Symlinks broken on Windows](https://github.com/smartdevicelink/sdl_java_suite/issues/1062) - Windows user must run a gradle task (`buildWindowSymLinks`) in order to create the Windows version of symlinks. 
-- [Audio over AOA Issues](https://github.com/smartdevicelink/sdl_java_suite/issues/1056) - Media apps will now wait until an audio output device is ready before connecting over a transport. This can be overwritten by the developer.
-- [Fixed LeftRearInflatableBelted using the wrong key value in BeltStatus Class](https://github.com/smartdevicelink/sdl_java_suite/issues/1078)
-- [New Router Service and old USB Transport compatibility issues](https://github.com/smartdevicelink/sdl_java_suite/issues/1064) - Fixed an issue that caused apps not close when a legacy AOA app was chosen by the user.
-- [Fixed an issue with `sendSequentialRPCs` where it didn't call `onResponse` and stoped on first `onError`](https://github.com/smartdevicelink/sdl_java_suite/issues/1061)
-
-## Misc
-- [Updated library to use the newest BSON library](https://github.com/smartdevicelink/sdl_java_suite/pull/1072)
-- [Update gradle plugin](https://github.com/smartdevicelink/sdl_java_suite/pull/1077)
+- [Fix ChoiceSetManager issue with HUs that require VR for choices](https://github.com/smartdevicelink/sdl_java_suite/issues/1137)
\ No newline at end of file
diff --git a/VERSION b/VERSION
index b617d997d..1f1ac7c2f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.9.0
\ No newline at end of file
+4.9.1
\ No newline at end of file
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java
index 074f89947..4ac5cb659 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java
@@ -80,17 +80,15 @@ class CheckChoiceVROptionalOperation implements Runnable {
 					isVROptional = true;
 					deleteTestChoiceSet();
 				}else{
+					DebugTool.logWarning("Head unit doesn't support choices with no VR.");
 					sendTestChoiceWithVR();
 				}
 			}
 
 			@Override
 			public void onError(int correlationId, Result resultCode, String info){
-				DebugTool.logError("There was an error in the check choice vr optional operation. Send test choice with no VR failed. Error: " + info + " resultCode: " + resultCode);
-				isVROptional = false;
-				if (checkChoiceVROptionalInterface != null){
-					checkChoiceVROptionalInterface.onError(info);
-				}
+				DebugTool.logWarning("Head unit doesn't support choices with no VR. Error: " + info + " resultCode: " + resultCode);
+				sendTestChoiceWithVR();
 			}
 		});
 
diff --git a/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java b/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
index c38fe3297..72e92c24b 100644
--- a/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
+++ b/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
@@ -32,5 +32,5 @@ package com.smartdevicelink;
 
 // THIS FILE IS AUTO GENERATED, DO NOT MODIFY!!
 public final class BuildConfig {
-    public static final String VERSION_NAME = "4.9.0";
+    public static final String VERSION_NAME = "4.9.1";
 }
\ No newline at end of file