Merge pull request #1205 from smartdevicelink/release/4.10-RC

v4.10 Release
smartdevicelink · Oct 30, 2019 · 9377865 · 9377865
2 parents 014401c + a3b3832
commit 9377865
Show file tree

Hide file tree

Showing 308 changed files with 14,711 additions and 2,357 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ android:
     - tools
     - platform-tools
     - ndk-bundle
-  
+
     # The BuildTools version used by your project
     - build-tools-28.0.3
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,59 @@
-# 4.9.1 Release Notes
+# 4.10.0 Release Notes
 
-### Hotfix
+## Features
 
-- [Fix ChoiceSetManager issue with HUs that require VR for choices](https://github.com/smartdevicelink/sdl_java_suite/issues/1137)
+- [[SDL 0054] ChangeRegistration Manager was implemented for the Java Suite](https://github.com/smartdevicelink/sdl_java_suite/issues/1140)
+- [[SDL 0116] Open Menu RPC](https://github.com/smartdevicelink/sdl_java_suite/issues/659)
+- [[SDL 0115] CloseApplication RPC](https://github.com/smartdevicelink/sdl_java_suite/issues/658)
+- [[SDL 0119] SDL Passenger Mode](https://github.com/smartdevicelink/sdl_java_suite/issues/735)
+- [[SDL 0173] Read Generic Network Signal Data](https://github.com/smartdevicelink/sdl_java_suite/issues/990)
+- [[SDL 0177] Alert icon](https://github.com/smartdevicelink/sdl_java_suite/issues/795)
+- [[SDL 0179] Pixel density and Scale](https://github.com/smartdevicelink/sdl_java_suite/issues/804)
+- [[SDL 0184] Cancel Interaction RPC](https://github.com/smartdevicelink/sdl_java_suite/issues/840)
+- [[SDL 0186] Template Titles](https://github.com/smartdevicelink/sdl_java_suite/issues/818)
+- [[SDL 0199]-Adding-GPS-Shift-support](https://github.com/smartdevicelink/sdl_java_suite/issues/875)
+- [[SDL 0207] - RPC message protection](https://github.com/smartdevicelink/sdl_java_suite/issues/978)
+- [[SDL 0213]- Remote Control - Radio and Climate Parameter Update](https://github.com/smartdevicelink/sdl_java_suite/issues/960)
+- [[SDL 0216] Widget support](https://github.com/smartdevicelink/sdl_java_suite/issues/1069)
+- [[SDL 0221] Remote Control - Allow Multiple Modules per Module Type](https://github.com/smartdevicelink/sdl_java_suite/issues/1070)
+- [[SDL 0223] Add Currently Playing Media Image to MediaServiceData](https://github.com/smartdevicelink/sdl_java_suite/issues/1047)
+- [[SDL 0224] Navigation Subscription Buttons](https://github.com/smartdevicelink/sdl_java_suite/issues/1068)
+- [[SDL 0225] Update Published App Services](https://github.com/smartdevicelink/sdl_java_suite/issues/1060)
+- [[SDL 0231] Add Tiles as an Option for Main Menus](https://github.com/smartdevicelink/sdl_java_suite/issues/1076)
+- [[SDL 0243] Manager Update for DisplayCapability](https://github.com/smartdevicelink/sdl_java_suite/issues/1154)
+- [[SDL 0246] Add App Services to HMICapabilities](https://github.com/smartdevicelink/sdl_java_suite/issues/1159)
+- [Add showInOptionalState to LockScreenConfig along with other missing methods](https://github.com/smartdevicelink/sdl_java_suite/pull/1153)
+- [Make TCP use new transport layers](https://github.com/smartdevicelink/sdl_java_suite/pull/1108)
+- [FileManager now has getBytesAvailable() ](https://github.com/smartdevicelink/sdl_java_suite/issues/1133)
+- [Added isHighlighted & systemAction setters to SoftButtonState](https://github.com/smartdevicelink/sdl_java_suite/issues/1127)
+- [SoftButtonObject now let developers set their own ids](https://github.com/smartdevicelink/sdl_java_suite/issues/1126)
+- [Added prerecordedSpeech to SystemCapabilityManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1123)
+
+
+
+## Bug Fixes
+
+- [Prevent NPE when using Static Icons in the MenuManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1193)
+- [iSdlProtocol now gets notified when encrypted session is started](https://github.com/smartdevicelink/sdl_java_suite/issues/1181)
+- [Prevent NPE in TransportBrokerImpl.onHardwareDisconnected(SourceFile_309)](https://github.com/smartdevicelink/sdl_java_suite/issues/1082)
+- [Prevent NPE in SdlRouterService.java:3220 (handleIncommingClientMessage)](https://github.com/smartdevicelink/sdl_java_suite/issues/1101)
+- [Fix isStreaming() method in VSM](https://github.com/smartdevicelink/sdl_java_suite/issues/1164)
+- [Fix issues causing the video stream to not resume after stopping](https://github.com/smartdevicelink/sdl_java_suite/issues/1102) 
+    - [Also see #1150](https://github.com/smartdevicelink/sdl_java_suite/issues/1150)
+- [Fix an issue that caused the video (NAV) service and stream to not be able to start again after the secondary transport was disconnected and reconnected](https://github.com/smartdevicelink/sdl_java_suite/issues/1151)
+- [Fix NPE in UsbAccessory.getManufacturer()](https://github.com/smartdevicelink/sdl_java_suite/issues/1086)
+- [Prevent a runtime exception when service isn't started in the foreground in time](https://github.com/smartdevicelink/sdl_java_suite/issues/1167)
+- [Dispose main underlying layers when SdlManager is disposed](https://github.com/smartdevicelink/sdl_java_suite/pull/1176)
+- [Align some RPC response params with RPC spec and make them not mandatory ](https://github.com/smartdevicelink/sdl_java_suite/issues/1180)
+- [Fix an issue where static Icons were not working with the ChoiceManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1194)
+- [Fix typo issue and register the SdlRouterService Bluetooth broadcast receiver to listen for state changes](https://github.com/smartdevicelink/sdl_java_suite/issues/1190)
+- [Register legacy Bluetooth broadcast receiver to listen for state changes](https://github.com/smartdevicelink/sdl_java_suite/pull/1192)
+- [Fix issue where video formats aren't supported, but used to start the video service](https://github.com/smartdevicelink/sdl_java_suite/pull/1206)
+- [Allow FileManager to start even with certain RPCs aren't allowed, eg ListFiles](https://github.com/smartdevicelink/sdl_java_suite/pull/1201)
+
+
+## Misc
+
+- [Fix misc code analyzer issues](https://github.com/smartdevicelink/sdl_java_suite/pull/1179)
+- [Old proxy classes are now deprecated ](https://github.com/smartdevicelink/sdl_java_suite/issues/1148)
+- [Align lockscreen behavior between platforms](https://github.com/smartdevicelink/sdl_java_suite/issues/1125)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.9.1
+4.10.0
diff --git a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
@@ -15,6 +15,7 @@
 import com.smartdevicelink.managers.SdlManager;
 import com.smartdevicelink.managers.SdlManagerListener;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
+import com.smartdevicelink.managers.lifecycle.LifecycleConfigurationUpdate;
 import com.smartdevicelink.managers.screen.choiceset.ChoiceCell;
 import com.smartdevicelink.managers.screen.choiceset.ChoiceSet;
 import com.smartdevicelink.managers.screen.choiceset.ChoiceSetSelectionListener;
@@ -32,6 +33,9 @@
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
 import com.smartdevicelink.proxy.rpc.enums.InteractionMode;
+import com.smartdevicelink.proxy.rpc.enums.Language;
+import com.smartdevicelink.proxy.rpc.enums.MenuLayout;
+import com.smartdevicelink.proxy.rpc.enums.PredefinedWindows;
 import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 import com.smartdevicelink.transport.BaseTransportConfig;
@@ -50,6 +54,8 @@ public class SdlService extends Service {
 	private static final String TAG 					= "SDL Service";
 
 	private static final String APP_NAME 				= "Hello Sdl";
+	private static final String APP_NAME_ES 			= "Hola Sdl";
+	private static final String APP_NAME_FR 			= "Bonjour Sdl";
 	private static final String APP_ID 					= "8678309";
 
 	private static final String ICON_FILENAME 			= "hello_sdl_icon.png";
@@ -156,7 +162,7 @@ private void startProxy() {
 
 			// The app type to be used
 			Vector<AppHMIType> appType = new Vector<>();
-			appType.add(AppHMIType.MEDIA);
+			appType.add(AppHMIType.DEFAULT);
 
 			// The manager listener helps you know when certain events that pertain to the SDL Manager happen
 			// Here we will listen for ON_HMI_STATUS and ON_COMMAND notifications
@@ -167,8 +173,11 @@ public void onStart() {
 					sdlManager.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, new OnRPCNotificationListener() {
 						@Override
 						public void onNotified(RPCNotification notification) {
-							OnHMIStatus status = (OnHMIStatus) notification;
-							if (status.getHmiLevel() == HMILevel.HMI_FULL && ((OnHMIStatus) notification).getFirstRun()) {
+							OnHMIStatus onHMIStatus = (OnHMIStatus)notification;
+							if (onHMIStatus.getWindowID() != null && onHMIStatus.getWindowID() != PredefinedWindows.DEFAULT_WINDOW.getValue()) {
+								return;
+							}
+							if (onHMIStatus.getHmiLevel() == HMILevel.HMI_FULL && onHMIStatus.getFirstRun()) {
 								setVoiceCommands();
 								sendMenus();
 								performWelcomeSpeak();
@@ -187,6 +196,23 @@ public void onDestroy() {
 				@Override
 				public void onError(String info, Exception e) {
 				}
+
+				@Override
+				public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language){
+					String appName;
+					switch (language) {
+						case ES_MX:
+							appName = APP_NAME_ES;
+							break;
+						case FR_CA:
+							appName = APP_NAME_FR;
+							break;
+						default:
+							return null;
+					}
+
+					return new LifecycleConfigurationUpdate(appName,null,TTSChunkFactory.createSimpleTTSChunks(appName), null);
+				}
 			};
 
 			// Create App Icon, this is set in the SdlManager builder
@@ -270,7 +296,7 @@ public void onTriggered(TriggerSource trigger) {
 		});
 
 		// sub menu parent cell
-		MenuCell mainCell3 = new MenuCell("Test Cell 3 (sub menu)", null, Arrays.asList(subCell1,subCell2));
+		MenuCell mainCell3 = new MenuCell("Test Cell 3 (sub menu)", MenuLayout.LIST, null, Arrays.asList(subCell1,subCell2));
 
 		MenuCell mainCell4 = new MenuCell("Show Perform Interaction", null, null, new MenuSelectionListener() {
 			@Override

diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle
@@ -6,7 +6,7 @@ android {
     compileSdkVersion 28
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 11
         versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

diff --git a/android/sdl_android/src/androidTest/assets/json/Alert.json b/android/sdl_android/src/androidTest/assets/json/Alert.json
@@ -9,6 +9,11 @@
 			"alertText2":"Line 2",
 			"alertText3":"Line 3",
 			"progressIndicator":true,
+			"cancelID":45,
+			"alertIcon":{
+				"value":"alertIconImage1.png",
+				"imageType":"DYNAMIC"
+			},
 			"ttsChunks":[
 				{
 					"text":"Phrase 1",

diff --git a/android/sdl_android/src/androidTest/assets/json/CancelInteraction.json b/android/sdl_android/src/androidTest/assets/json/CancelInteraction.json
@@ -0,0 +1,14 @@
+{
+  "request":{
+    "name":"CancelInteraction",
+    "correlationID":554,
+    "parameters":{
+      "cancelID":6052,
+      "functionID":12
+    }
+  },
+  "response":{
+    "name":"CancelInteractionResponse",
+    "correlationID":554
+  }
+}
diff --git a/android/sdl_android/src/androidTest/assets/json/CloseApplication.json b/android/sdl_android/src/androidTest/assets/json/CloseApplication.json
@@ -0,0 +1,11 @@
+{
+  "request":{
+    "name":"CloseApplication",
+    "correlationID":131
+  },
+  "response":{
+    "name":"CloseApplicationResponse",
+    "correlationID":131,
+    "parameters":{}
+  }
+}
diff --git a/android/sdl_android/src/androidTest/assets/json/CreateWindow.json b/android/sdl_android/src/androidTest/assets/json/CreateWindow.json
@@ -0,0 +1,17 @@
+{
+  "request":{
+    "name":"CreateWindow",
+    "correlationID":107,
+    "parameters":{
+    	"windowID":765,
+    	"windowName":"Window Name",
+    	"type": "MAIN",
+    	"associatedServiceType":"Service Type",
+    	"duplicateUpdatesFromWindowID":766
+	}
+  },
+  "response":{
+    "name":"CreateWindowResponse",
+    "correlationID":108
+  }
+}
diff --git a/android/sdl_android/src/androidTest/assets/json/DeleteWindow.json b/android/sdl_android/src/androidTest/assets/json/DeleteWindow.json
@@ -0,0 +1,13 @@
+{
+  "request":{
+    "name":"DeleteWindow",
+    "correlationID":109,
+    "parameters":{
+    	"windowID":765
+	}
+  },
+  "response":{
+    "name":"DeleteWindowResponse",
+    "correlationID":110
+  }
+}
diff --git a/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleDataConsent.json b/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleDataConsent.json
@@ -0,0 +1,23 @@
+{
+  "request":{
+    "name":"GetInteriorVehicleDataConsent",
+    "correlationID":168,
+    "parameters":{
+      "moduleType":"CLIMATE",
+      "moduleIds":[
+        "A0A",
+        "R0A"
+      ]
+    }
+  },
+  "response":{
+    "name":"GetInteriorVehicleDataConsent",
+    "correlationID":169,
+    "parameters":{
+      "allowed":[
+        true,
+        true
+      ]
+    }
+  }
+}
diff --git a/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json b/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json
@@ -31,7 +31,8 @@
       "myKey":true,
       "fuelRange":true,
       "turnSignal":true,
-      "electronicParkBrakeStatus":true
+      "electronicParkBrakeStatus":true,
+      "oemCustomVehicleDataName":true
     }
   },
   "response":{
@@ -168,7 +169,8 @@
           "type":"DIESEL",
           "range":10.0
         }
-      ]
+      ],
+      "oemCustomVehicleDataName":"oemCustomVehicleDataState"
     }
   }
 }
diff --git a/android/sdl_android/src/androidTest/assets/json/PerformInteraction.json b/android/sdl_android/src/androidTest/assets/json/PerformInteraction.json
@@ -43,6 +43,7 @@
         }
       ],
       "timeout":0,
+      "cancelID":45,
       "vrHelp":[
         {
           "position":7,

diff --git a/android/sdl_android/src/androidTest/assets/json/ReleaseInteriorVehicleDataModule.json b/android/sdl_android/src/androidTest/assets/json/ReleaseInteriorVehicleDataModule.json
@@ -0,0 +1,14 @@
+{
+  "request":{
+    "name":"ReleaseInteriorVehicleDataModule",
+    "correlationID":172,
+    "parameters":{
+      "moduleType":"CLIMATE",
+      "moduleIds":"A0A"
+    }
+  },
+  "response":{
+    "name":"ReleaseInteriorVehicleDataModule",
+    "correlationID":173
+  }
+}
diff --git a/android/sdl_android/src/androidTest/assets/json/ScrollableMessage.json b/android/sdl_android/src/androidTest/assets/json/ScrollableMessage.json
@@ -5,6 +5,7 @@
     "parameters":{
       "scrollableMessageBody":"Sample body text",
       "timeout":1000,
+      "cancelID":45,
       "softButtons":[
         {
           "isHighlighted":true,

diff --git a/android/sdl_android/src/androidTest/assets/json/Show.json b/android/sdl_android/src/androidTest/assets/json/Show.json
@@ -17,10 +17,49 @@
       "mainField2":"Main Field 2",
       "mainField3":"Main Field 3",
       "mainField4":"Main Field 4",
+      "templateTitle":"Template Title",
       "statusBar":"Status",
       "mediaClock":"Media Clock",
       "alignment":"LEFT_ALIGNED",
       "mediaTrack":"Media Track",
+      "windowID":10,
+      "templateConfiguration": {
+        "template": "template",
+        "dayColorScheme": {
+          "backgroundColor": {
+            "blue": 9,
+            "green": 8,
+            "red": 7
+          },
+          "secondaryColor": {
+            "blue": 6,
+            "green": 5,
+            "red": 4
+          },
+          "primaryColor": {
+            "blue": 3,
+            "green": 2,
+            "red": 1
+          }
+        },
+        "nightColorScheme": {
+          "backgroundColor": {
+            "blue": 18,
+            "green": 17,
+            "red": 16
+          },
+          "secondaryColor": {
+            "blue": 15,
+            "green": 14,
+            "red": 13
+          },
+          "primaryColor": {
+            "blue": 12,
+            "green": 11,
+            "red": 10
+          }
+        }
+      },
       "secondaryGraphic":{
         "value":"image2.png",
         "imageType":"STATIC"

diff --git a/android/sdl_android/src/androidTest/assets/json/ShowAppMenu.json b/android/sdl_android/src/androidTest/assets/json/ShowAppMenu.json
@@ -0,0 +1,13 @@
+{
+  "request":{
+    "name":"ShowAppMenu",
+    "correlationID":187,
+    "parameters":{
+      "menuID":100
+    }
+  },
+  "response":{
+    "name":"ShowAppMenuResponse",
+    "correlationID":188
+  }
+}
diff --git a/android/sdl_android/src/androidTest/assets/json/Slider.json b/android/sdl_android/src/androidTest/assets/json/Slider.json
@@ -12,7 +12,8 @@
         "Header Line 4"
       ],
       "position":11,
-      "timeout":30000
+      "timeout":30000,
+      "cancelID":45
     }
   },
   "response":{