Skip to content

Commit b7a905e

Browse files
bilal-alsharifibilal-alsharifi
authored
Merge pull request #1337 from smartdevicelink/release/4.11-RC
v4.11 Release
2 parents 797b7a1 + 9fe2e34 commit b7a905e

File tree

122 files changed

+7882
-764
lines changed

Some content is hidden

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

122 files changed

+7882
-764
lines changed

‎.github/workflows/android.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: GitHub CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
test:
7+
runs-on: macOS-latest
8+
steps:
9+
10+
- name: Checkout
11+
uses: actions/checkout@v2
12+
with:
13+
submodules: true
14+
15+
- name: Setup JDK
16+
uses: actions/setup-java@v1
17+
with:
18+
java-version: 1.8
19+
20+
- name: Sdl Android Tests
21+
# For more info, please check out: https://github.com/marketplace/actions/android-emulator-runner
22+
uses: reactivecircus/android-emulator-runner@v2
23+
with:
24+
api-level: 29
25+
script: ./android/gradlew -p ./android :sdl_android:connectedCheck
26+
27+
- name: Hello Sdl Android Tests
28+
run: ./android/gradlew -p ./android :hello_sdl_android:build
29+
30+
- name: Sdl JavaSE Tests
31+
run: ./javaSE/gradlew -p ./javaSE test
32+
33+
- name: Hello Sdl JavaSE Tests
34+
run: ./hello_sdl_java/gradlew -p ./hello_sdl_java test
35+
36+
- name: Sdl JavaEE Tests
37+
run: ./javaEE/gradlew -p ./javaEE test
38+
39+
- name: RPC Generator Tests
40+
run: |
41+
python3 -m pip install -r ./generator/requirements.txt
42+
python3 ./generator/test/runner.py
43+
44+
- name: Codecov
45+
uses: codecov/codecov-action@v1.0.6
46+
with:
47+
yml: ./codecov.yml

‎.gitignore

+11
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,15 @@ build/
7373
/.idea/libraries
7474
/captures
7575
.externalNativeBuild
76+
gradle/
77+
gradlew
78+
gradlew.bat
7679

80+
##############################
81+
# Python
82+
##############################
83+
*.venv*
84+
*__pycache__
85+
*htmlcov
86+
*.coverage
87+
*.pytest_cache

‎.gitmodules

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "generator/rpc_spec"]
2+
path = generator/rpc_spec
3+
url = https://github.com/smartdevicelink/rpc_spec.git
4+
branch = master

‎.travis.yml

-59
This file was deleted.

‎CHANGELOG.md

+66-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,68 @@
1-
# 4.10.1 Release Notes
1+
# 4.11.0 Release Notes
22

3-
## Hotfix
3+
### Summary:
4+
||Version|
5+
|--|--|
6+
|**Protocol** |5.2.0
7+
| **RPC** |6.0.0
8+
| **Tested Targeting** |Android 29
49

5-
- [Fix issue with video streaming stability](https://github.com/smartdevicelink/sdl_java_suite/pull/1214)
6-
- [Fix potential overflow issue in BestRouterComparator ](https://github.com/smartdevicelink/sdl_java_suite/pull/1229)
7-
- [Fix NPL in TransportBrokerImpl.resetSession() ](https://github.com/smartdevicelink/sdl_java_suite/pull/1226)
8-
- [Fix some potential NPEs in SystemCapabilityManager](https://github.com/smartdevicelink/sdl_java_suite/pull/1222)
9-
- [Fix potential NPEs in BaseMenuManager](https://github.com/smartdevicelink/sdl_java_suite/pull/1216)
10-
- [Add AppInfo to RegisterAppInterface RPC](https://github.com/smartdevicelink/sdl_java_suite/pull/1220)
10+
## Features
11+
12+
- [[SDL 0234] Proxy Library RPC Generation](https://github.com/smartdevicelink/sdl_java_suite/issues/1090)
13+
14+
- [[SDL 0124] SDLImageUploadManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1326)
15+
16+
- [[SDL 0191] Retry Failed File Uploads](https://github.com/smartdevicelink/sdl_java_suite/issues/830)
17+
18+
- [[SDL 0220] Support for Android custom RouterService](https://github.com/smartdevicelink/sdl_java_suite/issues/1079)
19+
20+
- [Use GitHub Actions ](https://github.com/smartdevicelink/sdl_java_suite/pull/1233)
21+
22+
23+
## Enhancements
24+
25+
- [Align SystemCapabilityManager with iOS](https://github.com/smartdevicelink/sdl_java_suite/issues/1324)
26+
27+
- [SystemCapabilityManager doesn't fully support capability subscriptions ](https://github.com/smartdevicelink/sdl_java_suite/issues/1255)
28+
29+
- [Align Video Streaming State with iOS](https://github.com/smartdevicelink/sdl_java_suite/issues/1331)
30+
31+
- [SoftButtonObject override Equals method](https://github.com/smartdevicelink/sdl_java_suite/issues/1257)
32+
33+
- [Lock Screen Icon is not cached](https://github.com/smartdevicelink/sdl_java_suite/issues/1316)
34+
35+
- [Update License to 2020](https://github.com/smartdevicelink/sdl_java_suite/issues/1264)
36+
37+
38+
## Bug Fixes
39+
40+
- [Inconsistently in ScreenManager behavior if displayCapabilities is null](https://github.com/smartdevicelink/sdl_java_suite/issues/1310)
41+
42+
- [Remove left over code in hellosdl](https://github.com/smartdevicelink/sdl_java_suite/pull/1330)
43+
44+
- [VideoStreaming does not start during HMI Level "LIMITED".](https://github.com/smartdevicelink/sdl_java_suite/issues/1289)
45+
46+
- [Scale Workaround for legacy high-res displays](https://github.com/smartdevicelink/sdl_java_suite/issues/1282)
47+
48+
- [Refactor router service's exitForeground logic](https://github.com/smartdevicelink/sdl_java_suite/pull/1311)
49+
50+
- [No Overwrite property for SdlFiles](https://github.com/smartdevicelink/sdl_java_suite/issues/1302)
51+
52+
- [Deprecate DeviceInfo.DEVICE_OS](https://github.com/smartdevicelink/sdl_java_suite/issues/1290)
53+
54+
- [Missing enums ](https://github.com/smartdevicelink/sdl_java_suite/issues/1283)
55+
56+
- [BaseFileManager UploadFiles handles static icons differently then UploadFile](https://github.com/smartdevicelink/sdl_java_suite/issues/1284)
57+
58+
- [USB transport drops remaining data after PSM FINISHED or ERROR state](https://github.com/smartdevicelink/sdl_java_suite/issues/1279)
59+
60+
- [Delete notification channel when possible](https://github.com/smartdevicelink/sdl_java_suite/pull/1271)
61+
62+
- [Null pointer exception in startStream if hapticSpatialDataSupported is missing](https://github.com/smartdevicelink/sdl_java_suite/issues/1245)
63+
64+
- [Issue in VoiceCommandManager.setVoiceCommands()](https://github.com/smartdevicelink/sdl_java_suite/issues/1293)
65+
66+
- [Video streaming doesn't start again after closing the app using voice commands](https://github.com/smartdevicelink/sdl_java_suite/issues/1248)
67+
68+
- [Potential NPE in TextAndGraphicManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1237)

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
1+
Copyright (c) 2017 - 2020, SmartDeviceLink Consortium, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[![Build Status](https://travis-ci.org/smartdevicelink/sdl_java_suite.svg?branch=master)](https://travis-ci.org/smartdevicelink/sdl_java_suite)
2-
[![codecov](https://codecov.io/gh/smartdevicelink/sdl_android/branch/master/graph/badge.svg)](https://codecov.io/gh/smartdevicelink/sdl_java_suite)
1+
[![Build Status](https://github.com/smartdevicelink/sdl_java_suite/workflows/GitHub%20CI/badge.svg?branch=master)](https://github.com/smartdevicelink/sdl_java_suite/actions)
2+
[![codecov](https://codecov.io/gh/smartdevicelink/sdl_java_suite/branch/master/graph/badge.svg)](https://codecov.io/gh/smartdevicelink/sdl_java_suite)
33
[![Slack Status](http://sdlslack.herokuapp.com/badge.svg)](http://slack.smartdevicelink.com)
44

55
# SmartDeviceLink (SDL)

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.10.1
1+
4.11.0

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

-13
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77

88
import com.smartdevicelink.transport.SdlBroadcastReceiver;
99
import com.smartdevicelink.transport.SdlRouterService;
10-
import com.smartdevicelink.transport.TransportConstants;
1110

1211
public class SdlReceiver extends SdlBroadcastReceiver {
1312
private static final String TAG = "SdlBroadcastReciever";
14-
public static final String RECONNECT_LANG_CHANGE = "RECONNECT_LANG_CHANGE";
1513

1614
@Override
1715
public void onSdlEnabled(Context context, Intent intent) {
@@ -36,16 +34,5 @@ public Class<? extends SdlRouterService> defineLocalSdlRouterClass() {
3634
@Override
3735
public void onReceive(Context context, Intent intent) {
3836
super.onReceive(context, intent); // Required if overriding this method
39-
40-
if (intent != null) {
41-
String action = intent.getAction();
42-
if (action != null){
43-
if(action.equalsIgnoreCase(TransportConstants.START_ROUTER_SERVICE_ACTION)) {
44-
if (intent.getBooleanExtra(RECONNECT_LANG_CHANGE, false)) {
45-
onSdlEnabled(context, intent);
46-
}
47-
}
48-
}
49-
}
5037
}
5138
}

‎android/sdl_android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import org.apache.tools.ant.taskdefs.condition.Os
33

44

55
android {
6-
compileSdkVersion 28
6+
compileSdkVersion 29
77
defaultConfig {
88
minSdkVersion 8
9-
targetSdkVersion 28
10-
versionCode 11
9+
targetSdkVersion 29
10+
versionCode 12
1111
versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313
resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"'

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.smartdevicelink.transport.BaseTransportConfig;
2626
import com.smartdevicelink.transport.TCPTransportConfig;
2727

28+
import org.mockito.Mockito;
2829
import org.mockito.invocation.InvocationOnMock;
2930
import org.mockito.stubbing.Answer;
3031

@@ -60,6 +61,8 @@ public class SdlManagerTests extends AndroidTestCase2 {
6061
public void setUp() throws Exception{
6162
super.setUp();
6263

64+
mTestContext = Mockito.mock(Context.class);
65+
6366
// set transport
6467
transport = new TCPTransportConfig(TCP_PORT, DEV_MACHINE_IP_ADDRESS, true);
6568

@@ -125,6 +128,7 @@ public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language langua
125128
builder.setLockScreenConfig(lockScreenConfig);
126129
builder.setMinimumProtocolVersion(Test.GENERAL_VERSION);
127130
builder.setMinimumRPCVersion(Test.GENERAL_VERSION);
131+
builder.setContext(mTestContext);
128132
manager = builder.build();
129133

130134
// mock SdlProxyBase and set it manually

0 commit comments

Comments
 (0)