Skip to content

Commit 9377865

Browse files
joeygroverjoeygrover
authored
Merge pull request #1205 from smartdevicelink/release/4.10-RC
v4.10 Release
2 parents 014401c + a3b3832 commit 9377865

File tree

308 files changed

+14711
-2357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+14711
-2357
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android:
99
- tools
1010
- platform-tools
1111
- ndk-bundle
12-
12+
1313
# The BuildTools version used by your project
1414
- build-tools-28.0.3
1515

‎CHANGELOG.md‎

Lines changed: 57 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,59 @@
1-
# 4.9.1 Release Notes
1+
# 4.10.0 Release Notes
22

3-
### Hotfix
3+
## Features
44

5-
- [Fix ChoiceSetManager issue with HUs that require VR for choices](https://github.com/smartdevicelink/sdl_java_suite/issues/1137)
5+
- [[SDL 0054] ChangeRegistration Manager was implemented for the Java Suite](https://github.com/smartdevicelink/sdl_java_suite/issues/1140)
6+
- [[SDL 0116] Open Menu RPC](https://github.com/smartdevicelink/sdl_java_suite/issues/659)
7+
- [[SDL 0115] CloseApplication RPC](https://github.com/smartdevicelink/sdl_java_suite/issues/658)
8+
- [[SDL 0119] SDL Passenger Mode](https://github.com/smartdevicelink/sdl_java_suite/issues/735)
9+
- [[SDL 0173] Read Generic Network Signal Data](https://github.com/smartdevicelink/sdl_java_suite/issues/990)
10+
- [[SDL 0177] Alert icon](https://github.com/smartdevicelink/sdl_java_suite/issues/795)
11+
- [[SDL 0179] Pixel density and Scale](https://github.com/smartdevicelink/sdl_java_suite/issues/804)
12+
- [[SDL 0184] Cancel Interaction RPC](https://github.com/smartdevicelink/sdl_java_suite/issues/840)
13+
- [[SDL 0186] Template Titles](https://github.com/smartdevicelink/sdl_java_suite/issues/818)
14+
- [[SDL 0199]-Adding-GPS-Shift-support](https://github.com/smartdevicelink/sdl_java_suite/issues/875)
15+
- [[SDL 0207] - RPC message protection](https://github.com/smartdevicelink/sdl_java_suite/issues/978)
16+
- [[SDL 0213]- Remote Control - Radio and Climate Parameter Update](https://github.com/smartdevicelink/sdl_java_suite/issues/960)
17+
- [[SDL 0216] Widget support](https://github.com/smartdevicelink/sdl_java_suite/issues/1069)
18+
- [[SDL 0221] Remote Control - Allow Multiple Modules per Module Type](https://github.com/smartdevicelink/sdl_java_suite/issues/1070)
19+
- [[SDL 0223] Add Currently Playing Media Image to MediaServiceData](https://github.com/smartdevicelink/sdl_java_suite/issues/1047)
20+
- [[SDL 0224] Navigation Subscription Buttons](https://github.com/smartdevicelink/sdl_java_suite/issues/1068)
21+
- [[SDL 0225] Update Published App Services](https://github.com/smartdevicelink/sdl_java_suite/issues/1060)
22+
- [[SDL 0231] Add Tiles as an Option for Main Menus](https://github.com/smartdevicelink/sdl_java_suite/issues/1076)
23+
- [[SDL 0243] Manager Update for DisplayCapability](https://github.com/smartdevicelink/sdl_java_suite/issues/1154)
24+
- [[SDL 0246] Add App Services to HMICapabilities](https://github.com/smartdevicelink/sdl_java_suite/issues/1159)
25+
- [Add showInOptionalState to LockScreenConfig along with other missing methods](https://github.com/smartdevicelink/sdl_java_suite/pull/1153)
26+
- [Make TCP use new transport layers](https://github.com/smartdevicelink/sdl_java_suite/pull/1108)
27+
- [FileManager now has getBytesAvailable() ](https://github.com/smartdevicelink/sdl_java_suite/issues/1133)
28+
- [Added isHighlighted & systemAction setters to SoftButtonState](https://github.com/smartdevicelink/sdl_java_suite/issues/1127)
29+
- [SoftButtonObject now let developers set their own ids](https://github.com/smartdevicelink/sdl_java_suite/issues/1126)
30+
- [Added prerecordedSpeech to SystemCapabilityManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1123)
31+
32+
33+
34+
## Bug Fixes
35+
36+
- [Prevent NPE when using Static Icons in the MenuManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1193)
37+
- [iSdlProtocol now gets notified when encrypted session is started](https://github.com/smartdevicelink/sdl_java_suite/issues/1181)
38+
- [Prevent NPE in TransportBrokerImpl.onHardwareDisconnected(SourceFile_309)](https://github.com/smartdevicelink/sdl_java_suite/issues/1082)
39+
- [Prevent NPE in SdlRouterService.java:3220 (handleIncommingClientMessage)](https://github.com/smartdevicelink/sdl_java_suite/issues/1101)
40+
- [Fix isStreaming() method in VSM](https://github.com/smartdevicelink/sdl_java_suite/issues/1164)
41+
- [Fix issues causing the video stream to not resume after stopping](https://github.com/smartdevicelink/sdl_java_suite/issues/1102)
42+
- [Also see #1150](https://github.com/smartdevicelink/sdl_java_suite/issues/1150)
43+
- [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)
44+
- [Fix NPE in UsbAccessory.getManufacturer()](https://github.com/smartdevicelink/sdl_java_suite/issues/1086)
45+
- [Prevent a runtime exception when service isn't started in the foreground in time](https://github.com/smartdevicelink/sdl_java_suite/issues/1167)
46+
- [Dispose main underlying layers when SdlManager is disposed](https://github.com/smartdevicelink/sdl_java_suite/pull/1176)
47+
- [Align some RPC response params with RPC spec and make them not mandatory ](https://github.com/smartdevicelink/sdl_java_suite/issues/1180)
48+
- [Fix an issue where static Icons were not working with the ChoiceManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1194)
49+
- [Fix typo issue and register the SdlRouterService Bluetooth broadcast receiver to listen for state changes](https://github.com/smartdevicelink/sdl_java_suite/issues/1190)
50+
- [Register legacy Bluetooth broadcast receiver to listen for state changes](https://github.com/smartdevicelink/sdl_java_suite/pull/1192)
51+
- [Fix issue where video formats aren't supported, but used to start the video service](https://github.com/smartdevicelink/sdl_java_suite/pull/1206)
52+
- [Allow FileManager to start even with certain RPCs aren't allowed, eg ListFiles](https://github.com/smartdevicelink/sdl_java_suite/pull/1201)
53+
54+
55+
## Misc
56+
57+
- [Fix misc code analyzer issues](https://github.com/smartdevicelink/sdl_java_suite/pull/1179)
58+
- [Old proxy classes are now deprecated ](https://github.com/smartdevicelink/sdl_java_suite/issues/1148)
59+
- [Align lockscreen behavior between platforms](https://github.com/smartdevicelink/sdl_java_suite/issues/1125)

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.9.1
1+
4.10.0

‎android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.smartdevicelink.managers.SdlManager;
1616
import com.smartdevicelink.managers.SdlManagerListener;
1717
import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
18+
import com.smartdevicelink.managers.lifecycle.LifecycleConfigurationUpdate;
1819
import com.smartdevicelink.managers.screen.choiceset.ChoiceCell;
1920
import com.smartdevicelink.managers.screen.choiceset.ChoiceSet;
2021
import com.smartdevicelink.managers.screen.choiceset.ChoiceSetSelectionListener;
@@ -32,6 +33,9 @@
3233
import com.smartdevicelink.proxy.rpc.enums.FileType;
3334
import com.smartdevicelink.proxy.rpc.enums.HMILevel;
3435
import com.smartdevicelink.proxy.rpc.enums.InteractionMode;
36+
import com.smartdevicelink.proxy.rpc.enums.Language;
37+
import com.smartdevicelink.proxy.rpc.enums.MenuLayout;
38+
import com.smartdevicelink.proxy.rpc.enums.PredefinedWindows;
3539
import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
3640
import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
3741
import com.smartdevicelink.transport.BaseTransportConfig;
@@ -50,6 +54,8 @@ public class SdlService extends Service {
5054
private static final String TAG = "SDL Service";
5155

5256
private static final String APP_NAME = "Hello Sdl";
57+
private static final String APP_NAME_ES = "Hola Sdl";
58+
private static final String APP_NAME_FR = "Bonjour Sdl";
5359
private static final String APP_ID = "8678309";
5460

5561
private static final String ICON_FILENAME = "hello_sdl_icon.png";
@@ -156,7 +162,7 @@ private void startProxy() {
156162

157163
// The app type to be used
158164
Vector<AppHMIType> appType = new Vector<>();
159-
appType.add(AppHMIType.MEDIA);
165+
appType.add(AppHMIType.DEFAULT);
160166

161167
// The manager listener helps you know when certain events that pertain to the SDL Manager happen
162168
// Here we will listen for ON_HMI_STATUS and ON_COMMAND notifications
@@ -167,8 +173,11 @@ public void onStart() {
167173
sdlManager.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, new OnRPCNotificationListener() {
168174
@Override
169175
public void onNotified(RPCNotification notification) {
170-
OnHMIStatus status = (OnHMIStatus) notification;
171-
if (status.getHmiLevel() == HMILevel.HMI_FULL && ((OnHMIStatus) notification).getFirstRun()) {
176+
OnHMIStatus onHMIStatus = (OnHMIStatus)notification;
177+
if (onHMIStatus.getWindowID() != null && onHMIStatus.getWindowID() != PredefinedWindows.DEFAULT_WINDOW.getValue()) {
178+
return;
179+
}
180+
if (onHMIStatus.getHmiLevel() == HMILevel.HMI_FULL && onHMIStatus.getFirstRun()) {
172181
setVoiceCommands();
173182
sendMenus();
174183
performWelcomeSpeak();
@@ -187,6 +196,23 @@ public void onDestroy() {
187196
@Override
188197
public void onError(String info, Exception e) {
189198
}
199+
200+
@Override
201+
public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language){
202+
String appName;
203+
switch (language) {
204+
case ES_MX:
205+
appName = APP_NAME_ES;
206+
break;
207+
case FR_CA:
208+
appName = APP_NAME_FR;
209+
break;
210+
default:
211+
return null;
212+
}
213+
214+
return new LifecycleConfigurationUpdate(appName,null,TTSChunkFactory.createSimpleTTSChunks(appName), null);
215+
}
190216
};
191217

192218
// Create App Icon, this is set in the SdlManager builder
@@ -270,7 +296,7 @@ public void onTriggered(TriggerSource trigger) {
270296
});
271297

272298
// sub menu parent cell
273-
MenuCell mainCell3 = new MenuCell("Test Cell 3 (sub menu)", null, Arrays.asList(subCell1,subCell2));
299+
MenuCell mainCell3 = new MenuCell("Test Cell 3 (sub menu)", MenuLayout.LIST, null, Arrays.asList(subCell1,subCell2));
274300

275301
MenuCell mainCell4 = new MenuCell("Show Perform Interaction", null, null, new MenuSelectionListener() {
276302
@Override

‎android/sdl_android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66
compileSdkVersion 28
77
defaultConfig {
88
minSdkVersion 8
9-
targetSdkVersion 26
9+
targetSdkVersion 28
1010
versionCode 11
1111
versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

‎android/sdl_android/src/androidTest/assets/json/Alert.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"alertText2":"Line 2",
1010
"alertText3":"Line 3",
1111
"progressIndicator":true,
12+
"cancelID":45,
13+
"alertIcon":{
14+
"value":"alertIconImage1.png",
15+
"imageType":"DYNAMIC"
16+
},
1217
"ttsChunks":[
1318
{
1419
"text":"Phrase 1",

‎android/sdl_android/src/androidTest/assets/json/CancelInteraction.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"request":{
3+
"name":"CancelInteraction",
4+
"correlationID":554,
5+
"parameters":{
6+
"cancelID":6052,
7+
"functionID":12
8+
}
9+
},
10+
"response":{
11+
"name":"CancelInteractionResponse",
12+
"correlationID":554
13+
}
14+
}

‎android/sdl_android/src/androidTest/assets/json/CloseApplication.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"request":{
3+
"name":"CloseApplication",
4+
"correlationID":131
5+
},
6+
"response":{
7+
"name":"CloseApplicationResponse",
8+
"correlationID":131,
9+
"parameters":{}
10+
}
11+
}

‎android/sdl_android/src/androidTest/assets/json/CreateWindow.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"request":{
3+
"name":"CreateWindow",
4+
"correlationID":107,
5+
"parameters":{
6+
"windowID":765,
7+
"windowName":"Window Name",
8+
"type": "MAIN",
9+
"associatedServiceType":"Service Type",
10+
"duplicateUpdatesFromWindowID":766
11+
}
12+
},
13+
"response":{
14+
"name":"CreateWindowResponse",
15+
"correlationID":108
16+
}
17+
}

‎android/sdl_android/src/androidTest/assets/json/DeleteWindow.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"request":{
3+
"name":"DeleteWindow",
4+
"correlationID":109,
5+
"parameters":{
6+
"windowID":765
7+
}
8+
},
9+
"response":{
10+
"name":"DeleteWindowResponse",
11+
"correlationID":110
12+
}
13+
}

0 commit comments

Comments
 (0)