Merge branch 'release/4.7.0-rc1'

Author: joeygrover

.travis.yml

@@ -13,6 +13,7 @@ android:
     - build-tools-27.0.3
 
     # The SDK version used to compile your project
+    - android-28
     - android-27
     - android-26
     - android-22 #For emulator
@@ -44,7 +45,7 @@ before_script:
 
 script:
   - android list target
-  - ./gradlew connectedCheck
+  - ./gradlew :sdl_android:connectedCheck
 
 before_install:
     - echo yes | sdkmanager "build-tools;27.0.3"

CHANGELOG.md

@@ -1,24 +1,82 @@
-# 4.6.0 Release Notes
-
-### API New Features & Breaking Changes
-- `RPCRequestFactory` has been deprecated. Please use the desired RPC's constructor instead.
-- The Android Annotations Library has been added to the project to better help and inform developers about the SDK.
-
-### Enhancements
-- The router service foreground lifecycle is improved. The notification should no longer be seen when connecting to non-SDL devices.
-- The SDL notification now links to a webpage to explain what the notification is and how to hide it.
-- The required `intent-filter` entires for the `SdlBroadcastReceiver` has been reduced. It is now only listening for the SDL custom intent, ACL connect, and USB connection if using AOA.
-- RPC classes now contain constructors with the required parameters for that RPC.
-- Moved project to newer version of Gradle. Updated configurations including from `compile` to `api` and `implementation`.
-- `SdlProxyBuilder` was cleaned up to remove redundant variables between the `SdlProxyBuilder.Builder` object and the `SdlProxyBuilder` class.
-
-### Bug Fixes
-- Fixed touch issues with the video streaming feature. A new module was added to handle touch events much more aligned with Android native views.
-- Fixed JavaDoc issue in `UnregisterAppInterface`.
-- Fixed JavaDoc issue in `AddCommand`.
-- Added tags to the string resource xml file to ignore translation
-- Temporary fix to the TCP transport to catch `NetworkOnTheMainThread` exceptions when the connection is closing.
-- Fix issue where the `SdlBroadcastReceiver` was attempting to send implicit intents to ping the `SdlRouterService`. They are now explicit. 
-- Fix a potential NPE in the `SdlBroadcastReceiver` while an app is only using USB and does not include an instance of an `SdlRouterService`. 
-- Removed reflection usage in bluetooth transports when operating on systems that are newer than Android Oreo in anticipation of Android P.
-- Fix an issue where the `SdlBroadcastReceiver` would throw a false positive regarding whether or not an app had included the correct `intent-filter` in their `SdlRouterService` manifest declaration.
+# 4.7.0 Release Notes
+
+## Summary
+
+- Manager APIs - The manager APIs will closely align with the iOS SDL Library managers, with a few exceptions to match the native platform. 
+- Transport layer overhaul - The protocol layer and transport layer have been overhauled to properly match the stack in which they should exist. This also sets up three additional features
+    - AOA multiplexing - SDL apps can now use the multiplexing transport with the AOA/USB transport. Multiple apps can then register on a single AOA connection to SDL Core.
+    - Primary/Secondary transports - apps can now carry their session over multiple transports with the first transport being primary, and a later connected one being a secondary. This means apps can register over bluetooth, then connect over WiFi when necessary (video/audio streaming).
+    - All apps should be using `MultiplexingConfig` at this point unless debugging with TCP.
+- Color Scheme for templates - App developers now have the ability to set color themes for the templates they use
+- New Remote Control modules
+- Additional vehicle data added
+- `SdlProxyALM` has been deprecated - The `SdlProxyALM` will still function for this release but it has now moved into maintenance mode and no new features will be added. The manager APIs should be used from this point forward.
+
+
+## New Features
+
+- [Add enum for `predefinedlayout`](https://github.com/smartdevicelink/sdl_android/pull/851)
+- [Feature/Listen for responses and capability changes in ISdl](https://github.com/smartdevicelink/sdl_android/pull/828)
+- [Add ability for RPCs to be versioned/formatted](https://github.com/smartdevicelink/sdl_android/pull/839)
+- [[SDL 0159] Static SDL Icon Names Enum](https://github.com/smartdevicelink/sdl_android/issues/740)
+
+#### Transport
+
+- [[SDL 0141] Supporting simultaneous multiple transports](https://github.com/smartdevicelink/sdl_android/issues/714)
+- [[SDL 0194] Android Transport Layer Overhaul](https://github.com/smartdevicelink/sdl_android/issues/841)
+
+#### Manager API
+
+- [[SDL 0171] Android Manager APIs](https://github.com/smartdevicelink/sdl_android/issues/782)
+- [[SDL 0113] SDLAudioStreamManager](https://github.com/smartdevicelink/sdl_android/issues/654)
+
+#### RPC Updates
+
+- [Add PLAY_PAUSE to ButtonName enum](https://github.com/smartdevicelink/sdl_android/issues/228)
+- [[SDL 0014] Adding Audio File Playback to TTSChunk](https://github.com/smartdevicelink/sdl_android/issues/419)
+- [[SDL 0037] Expand Mobile `PutFile` RPC](https://github.com/smartdevicelink/sdl_android/issues/452)
+- [[SDL 0041] Provide AppIcon resumption across app registration requests](https://github.com/smartdevicelink/sdl_android/issues/453)
+- [[SDL 0062] Template images](https://github.com/smartdevicelink/sdl_android/issues/533)
+- [[SDL 0064] Choice-VR optional](https://github.com/smartdevicelink/sdl_android/issues/739)
+- [[SDL 0063] Display name parameter](https://github.com/smartdevicelink/sdl_android/issues/534)
+- [[SDL 0163] Make spaceAvailable field non-mandatory ](https://github.com/smartdevicelink/sdl_android/issues/860)
+- [[SDL 0083] Expandable Design for Proprietary Data Exchange](https://github.com/smartdevicelink/sdl_android/issues/594)
+- [[SDL 0085] SubMenu Icon](https://github.com/smartdevicelink/sdl_android/issues/603)
+- [[SDL 0109] SetAudioStreamingIndicator RPC](https://github.com/smartdevicelink/sdl_android/issues/710)
+- [[SDL 0147] Template Improvements: Color Scheme](https://github.com/smartdevicelink/sdl_android/issues/715)
+- [[SDL 0150] Enhancing onHMIStatus with a New Parameter for Video Streaming State](https://github.com/smartdevicelink/sdl_android/issues/734)
+- [[SDL 0151] ImageFieldName for SecondaryImage](https://github.com/smartdevicelink/sdl_android/issues/724)
+- [[SDL 0153] Support for Short and Full UUID App ID](https://github.com/smartdevicelink/sdl_android/issues/738)
+
+#### Remote Control
+
+- [[SDL 0099] New modules LIGHT, AUDIO, HMI_SETTINGS and parameter SIS Data](https://github.com/smartdevicelink/sdl_android/issues/624)
+- [[SDL 0105] New Seat module](https://github.com/smartdevicelink/sdl_android/issues/651)
+- [[SDL 0106] OnRCStatus notification](https://github.com/smartdevicelink/sdl_android/issues/657)
+- [[SDL 0160] Radio Parameter Update](https://github.com/smartdevicelink/sdl_android/issues/741)
+- [[SDL 0165] Lights modules -  More Names and Status Values](https://github.com/smartdevicelink/sdl_android/issues/751)
+- [[SDL 0172] Update OnRCStatus with a new allowed parameter](https://github.com/smartdevicelink/sdl_android/issues/783)
+- [[SDL 0182] Audio Source AM/FM/XM/DAB](https://github.com/smartdevicelink/sdl_android/issues/809)
+
+#### Vehicle Data
+
+- [[SDL 0072] FuelRange](https://github.com/smartdevicelink/sdl_android/issues/552)
+- [[SDL 0082] EngineOilLife](https://github.com/smartdevicelink/sdl_android/issues/593)
+- [[SDL 0097] Tire pressure additions](https://github.com/smartdevicelink/sdl_android/issues/613)
+- [[SDL 0102] ElectronicParkBrakeStatus](https://github.com/smartdevicelink/sdl_android/issues/632)
+- [[SDL 0107] TurnSignal](https://github.com/smartdevicelink/sdl_android/issues/650)
+- [[SDL 0175] Updating DOP value range for GPS notification](https://github.com/smartdevicelink/sdl_android/issues/803)
+
+
+## Bug Fixes
+
+- [SystemCapabilityManager false positive issue](https://github.com/smartdevicelink/sdl_android/issues/844)
+- [Optimize video streaming for still graphics](https://github.com/smartdevicelink/sdl_android/issues/806)
+- [sdl.router.startservice broadcast is sent twice unexpectedly](https://github.com/smartdevicelink/sdl_android/issues/884)
+- [maxBitrate in VIDEO_STREAMING capability is read in wrong unit](https://github.com/smartdevicelink/sdl_android/issues/882)
+
+
+## Documentation
+
+- [Add third_party file](https://github.com/smartdevicelink/sdl_android/issues/865)
+

hello_sdl_android/build.gradle

@@ -0,0 +1,60 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        applicationId "com.sdl.hellosdlandroid"
+        minSdkVersion 14
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    flavorDimensions "default"
+    productFlavors{
+        multi_sec_high {
+            buildConfigField 'String', 'TRANSPORT', '"MULTI"'
+            buildConfigField 'String', 'SECURITY', '"HIGH"'
+        }
+        multi_sec_med {
+            buildConfigField 'String', 'TRANSPORT', '"MULTI"'
+            buildConfigField 'String', 'SECURITY', '"MED"'
+        }
+        multi_sec_low {
+            buildConfigField 'String', 'TRANSPORT', '"MULTI"'
+            buildConfigField 'String', 'SECURITY', '"LOW"'
+        }
+        multi_sec_off {
+            buildConfigField 'String', 'TRANSPORT', '"MULTI"'
+            buildConfigField 'String', 'SECURITY', '"OFF"'
+        }
+        multi_high_bandwidth {
+            buildConfigField 'String', 'TRANSPORT', '"MULTI_HB"'
+            buildConfigField 'String', 'SECURITY', '"OFF"'
+        }
+        tcp {
+            buildConfigField 'String', 'TRANSPORT', '"TCP"'
+            buildConfigField 'String', 'SECURITY', '"OFF"'
+        }
+    }
+    lintOptions {
+        disable 'GoogleAppIndexingWarning'
+    }
+}
+
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation project(path: ':sdl_android')
+    testImplementation 'junit:junit:4.12'
+}

hello_sdl_android/proguard-rules.pro

@@ -0,0 +1,28 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/livio/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+-keep class com.smartdevicelink.** { *; }
+-keep class com.livio.** { *; }
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

hello_sdl_android/src/main/AndroidManifest.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.sdl.hellosdlandroid">
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <!-- Required to check if WiFi is enabled -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+    <!-- Required to use the USB Accessory mode -->
+    <uses-feature android:name="android.hardware.usb.accessory" />
+
+    <application
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme"
+        tools:ignore="DeepLinks">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.smartdevicelink.transport.USBAccessoryAttachmentActivity"
+                  android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
+                android:resource="@xml/accessory_filter" />
+        </activity>
+
+        <service android:name="com.sdl.hellosdlandroid.SdlService" >
+        </service>
+        <service
+            android:name=".SdlRouterService"
+            android:exported="true"
+            android:process="com.smartdevicelink.router">
+            <intent-filter>
+                <action android:name="com.smartdevicelink.router.service"/>
+            </intent-filter>
+            <meta-data android:name="@string/sdl_router_service_version_name"  android:value="@integer/sdl_router_service_version_value" />
+        </service>
+        <receiver
+            android:name=".SdlReceiver"
+            android:enabled="true"
+            android:exported="true"
+            tools:ignore="ExportedReceiver">
+            <intent-filter>
+                <action android:name="com.smartdevicelink.USB_ACCESSORY_ATTACHED"/> <!--For AOA -->
+                <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
+                <action android:name="sdl.router.startservice" />
+            </intent-filter>
+        </receiver>
+        <activity android:name="com.smartdevicelink.managers.lockscreen.SDLLockScreenActivity"
+                  android:launchMode="singleTop"/>
+    </application>
+
+</manifest>

hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java

@@ -0,0 +1,43 @@
+package com.sdl.hellosdlandroid;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class MainActivity extends AppCompatActivity {
+	private static final String TAG = "MainActivity";
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_main);
+		//If we are connected to a module we want to start our SdlService
+		if(BuildConfig.TRANSPORT.equals("MULTI") || BuildConfig.TRANSPORT.equals("MULTI_HB")) {
+			SdlReceiver.queryForConnectedService(this);
+		}else if(BuildConfig.TRANSPORT.equals("TCP")) {
+			Intent proxyIntent = new Intent(this, SdlService.class);
+			startService(proxyIntent);
+		}
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.main, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		// Handle action bar item clicks here. The action bar will
+		// automatically handle clicks on the Home/Up button, so long
+		// as you specify a parent activity in AndroidManifest.xml.
+		int id = item.getItemId();
+		if (id == R.id.action_settings) {
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+}

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

@@ -0,0 +1,51 @@
+package com.sdl.hellosdlandroid;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.util.Log;
+
+import com.smartdevicelink.transport.SdlBroadcastReceiver;
+import com.smartdevicelink.transport.SdlRouterService;
+import com.smartdevicelink.transport.TransportConstants;
+
+public class SdlReceiver  extends SdlBroadcastReceiver {
+	private static final String TAG = "SdlBroadcastReciever";
+	public static final String RECONNECT_LANG_CHANGE = "RECONNECT_LANG_CHANGE";
+
+	@Override
+	public void onSdlEnabled(Context context, Intent intent) {
+		Log.d(TAG, "SDL Enabled");
+		intent.setClass(context, SdlService.class);
+
+		// SdlService needs to be foregrounded in Android O and above
+		// This will prevent apps in the background from crashing when they try to start SdlService
+		// Because Android O doesn't allow background apps to start background services
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			context.startForegroundService(intent);
+		} else {
+			context.startService(intent);
+		}
+	}
+
+	@Override
+	public Class<? extends SdlRouterService> defineLocalSdlRouterClass() {
+		return com.sdl.hellosdlandroid.SdlRouterService.class;
+	}
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		super.onReceive(context, intent); // Required if overriding this method
+
+		if (intent != null) {
+			String action = intent.getAction();
+			if (action != null){
+				if(action.equalsIgnoreCase(TransportConstants.START_ROUTER_SERVICE_ACTION)) {
+					if (intent.getBooleanExtra(RECONNECT_LANG_CHANGE, false)) {
+						onSdlEnabled(context, intent);
+					}
+				}
+			}
+		}
+	}
+}

hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlRouterService.java

@@ -0,0 +1,8 @@
+package com.sdl.hellosdlandroid;
+
+
+public class SdlRouterService extends  com.smartdevicelink.transport.SdlRouterService {
+
+
+
+}