Merge remote-tracking branch 'upstream/develop' into fork/0257_new_vehicle_data_hands_off_steering

2 files changed, 92 insertions, 28 deletions

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
index a1fb294e2..a2170c70a 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
@@ -29,27 +29,64 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.smartdevicelink.proxy.rpc.enums;

-/**

- * Character sets supported by SDL.

- * @since SmartDeviceLink 1.0

- */

-public enum CharacterSet {

-    TYPE2SET,

-    TYPE5SET,

-    CID1SET,

-    CID2SET;

-

-    /**

-     * Convert String to CharacterSet

-     * @param value String

-     * @return CharacterSet

-     */

-    public static CharacterSet valueForString(String value) {

-        try{

-            return valueOf(value);

-        }catch(Exception e){

-            return null;

-        }

-    }

-}

+package com.smartdevicelink.proxy.rpc.enums;
+/**
+ * Character sets supported by SDL.
+ * @since SmartDeviceLink 1.0
+ */
+public enum CharacterSet {
+    /**
+     * @deprecated in SmartDeviceLink 7.0.0
+     */
+    @Deprecated
+    TYPE2SET,
+    /**
+     * @deprecated in SmartDeviceLink 7.0.0
+     */
+    @Deprecated
+    TYPE5SET,
+    /**
+     * @deprecated in SmartDeviceLink 7.0.0
+     */
+    @Deprecated
+    CID1SET,
+    /**
+     * @deprecated in SmartDeviceLink 7.0.0
+     */
+    @Deprecated
+    CID2SET,
+    /**
+     * ASCII as defined in https://en.wikipedia.org/wiki/ASCII as defined in codes 0-127.
+     * Non-printable characters such as tabs and back spaces are ignored.
+     *
+     * @since SmartDeviceLink 7.0.0
+     */
+    ASCII,
+    /**
+     * Latin-1, as defined in https://en.wikipedia.org/wiki/ISO/IEC_8859-1
+     *
+     * @since SmartDeviceLink 7.0.0
+     */
+    ISO_8859_1,
+    /**
+     * The UTF-8 character set that uses variable bytes per code point.
+     * See https://en.wikipedia.org/wiki/UTF-8 for more details.
+     * This is the preferred character set.
+     *
+     * @since SmartDeviceLink 7.0.0
+     */
+    UTF_8;
+
+    /**
+     * Convert String to CharacterSet
+     * @param value String
+     * @return CharacterSet
+     */
+    public static CharacterSet valueForString(String value) {
+        try{
+            return valueOf(value);
+        }catch(Exception e){
+            return null;
+        }
+    }
+}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
index 758a33905..775781000 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * Copyright (c) 2017 - 2020, SmartDeviceLink Consortium, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,9 +13,9 @@
  * disclaimer in the documentation and/or other materials provided with the
  * distribution.
  *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
+ * Neither the name of the SmartDeviceLink Consortium Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -155,6 +155,13 @@ package com.smartdevicelink.proxy.rpc.enums;
  * 	       <td align=center>N</td>
  * 	       <td>Available Asynchronously, Call is synchronous <strong>after</strong> initial call</strong></td>
  * 	   </tr>
+ * 	   <tr>
+ * 	       <td>DRIVER_DISTRACTION</td>
+ * 	       <d>DriverDistractionCapability</td>
+ * 	       <td>Returns DRIVER_DISTRACTION</td>
+ * 	       <td align=center>N</td>
+ * 	       <td><strong>Since 7.0</strong> Describes capabilities when the driver is distracted</td>
+ * 	   </tr>
  * 	</table>
  *
  */
@@ -552,6 +559,26 @@ public enum SystemCapabilityType {
 	 */
 	SEAT_LOCATION (true),
 
+	/**
+	 * <table border="1" rules="all">
+	 * 		<tr>
+	 * 			<th>Enum Name</th>
+	 * 			<th>Return Type</th>
+	 * 			<th>Description</th>
+	 * 			<th>Requires Async?</th>
+	 * 			<th>Notes</th>
+	 * 		</tr>
+	 * 		<tr>
+	 * 			<td>DRIVER_DISTRACTION</td>
+	 * 			<td>DriverDistractionCapability</td>
+	 * 			<td>Returns DRIVER_DISTRACTION</td>
+	 * 			<td align=center>N</td>
+	 * 			<td><strong>Since 7.0</strong> Describes capabilities when the driver is distracted</td>
+	 * 		</tr>
+	 * 	</table>
+	 */
+	DRIVER_DISTRACTION(true);
+
 	;
 
     boolean IS_QUERYABLE;