Merge branch 'develop' into feature/issue_729_command_list_limitationsfeature/issue_729_command_list_limitations

# Conflicts:
#	VERSION
#	javaSE/src/main/java/com/smartdevicelink/BuildConfig.java

7 files changed, 67 insertions, 28 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ce384877..ab8517568 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,58 @@
-# 4.11.1 Release Notes
+# 4.12.0 Release Notes
 
 ### Summary:
 ||Version|
 |--|--|
-|**Protocol** |5.2.0
-| **RPC** |6.0.0
-| **Tested Targeting** |Android 29
+| **Protocol** | 5.2.0
+| **RPC** | 6.0.0
+| **Tested Targeting** | Android 29
 
-## Hotfix
+## Features
+- [[SDL 0230] SPP resource management for Android](https://github.com/smartdevicelink/sdl_java_suite/issues/1132)
 
-- [Samsung devices not properly managing notification channels](https://github.com/smartdevicelink/sdl_java_suite/issues/1351)
\ No newline at end of file
+- [[SDL 0279] Screen Manager Subscribe Buttons](https://github.com/smartdevicelink/sdl_java_suite/issues/1280)
+
+- [[SDL 0289] Support for Set Language Separately](https://github.com/smartdevicelink/sdl_java_suite/issues/1313)
+
+- [Add a way to set the resumption hash in the managers layer](https://github.com/smartdevicelink/sdl_java_suite/issues/1400)
+
+- [Change lock screen logo and ensure correct contrast](https://github.com/smartdevicelink/sdl_java_suite/issues/1342)
+
+
+## Enhancements
+- [[SDL 0306] Use Taskmaster To Handle Queuing Operations in Managers](https://github.com/smartdevicelink/sdl_java_suite/issues/1368)
+
+- [[SDL 0301] SDL Device Listener](https://github.com/smartdevicelink/sdl_java_suite/issues/1348)
+
+- [Sdl Android should use the new LifecycleManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1365)
+
+- [Deprecate onError for OnRPCResponseListener](https://github.com/smartdevicelink/sdl_java_suite/pull/1404)
+
+- [Add ForegroundServiceType Parameter to HelloSdl Project](https://github.com/smartdevicelink/sdl_java_suite/issues/1374)
+
+- [Update javadocs for PermissionManager.addListener](https://github.com/smartdevicelink/sdl_java_suite/pull/1364)
+
+- [PermissionManager Should send callback when subscribing to listener](https://github.com/smartdevicelink/sdl_java_suite/issues/1353)
+
+- [Move textFields / imageFields == null checking from ScreenManager to SystemCapabilityManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1335)
+
+- [Change Http to Https](https://github.com/smartdevicelink/sdl_java_suite/issues/1333)
+
+- [Move src/java/main/android folder](https://github.com/smartdevicelink/sdl_java_suite/issues/1377)
+
+- [Classes that need to be removed in next major release should be deprecated ](https://github.com/smartdevicelink/sdl_java_suite/issues/1362)
+
+- [OnSdlChoiceChosen contains duplicate class definitions](https://github.com/smartdevicelink/sdl_java_suite/issues/14)
+
+- [The name of setter and getter in OnButtonPress are ambiguous](https://github.com/smartdevicelink/sdl_java_suite/issues/547)
+
+
+## Bug Fixes
+
+- [presentChoiceSet failed with "INVALID_ID, null"](https://github.com/smartdevicelink/sdl_java_suite/issues/1336)
+
+- [ Android app will not receive the notification of HU when the language is switched on the HU side.](https://github.com/smartdevicelink/sdl_java_suite/issues/1372)
+
+- [If an empty array is set for voice commands on the SDLMenuCell the AddCommand is rejected](https://github.com/smartdevicelink/sdl_java_suite/issues/1341)
+
+- [Disconnecting a cloud app doesn't free the port](https://github.com/smartdevicelink/sdl_java_suite/issues/1339)
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 56ac37ad2..815588ef1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.12.0-RC
\ No newline at end of file
+4.12.0
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/Log.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/Log.java
index 150d9b3e9..c6f2d2649 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/util/Log.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/Log.java
@@ -1,22 +1,19 @@
 package com.smartdevicelink.util;
 
 public class Log {
-    public static int i(String tag, String message) {
+    public static void i(String tag, String message) {
         android.util.Log.i(tag, message);
-        return 10;
     }
 
-    public static int w(String tag, String message) {
+    public static void w(String tag, String message) {
         android.util.Log.w(tag, message);
-        return 10;
     }
 
-    public static int e(String tag, String message, Throwable t) {
+    public static void e(String tag, String message, Throwable t) {
         if (t != null) {
             android.util.Log.e(tag, message, t);
         } else {
             android.util.Log.e(tag, message);
         }
-        return 10;
     }
 }
\ No newline at end of file
diff --git a/base/src/main/java/com/smartdevicelink/util/NativeLogTool.java b/base/src/main/java/com/smartdevicelink/util/NativeLogTool.java
index 61d3932c8..b0e3217cb 100644
--- a/base/src/main/java/com/smartdevicelink/util/NativeLogTool.java
+++ b/base/src/main/java/com/smartdevicelink/util/NativeLogTool.java
@@ -109,7 +109,6 @@ public class NativeLogTool {
 			return false;

 		}

 

-		int bytesWritten = 0;

 		int substrSize = 0;

 		String chunk = null;

 		try {

@@ -118,18 +117,15 @@ public class NativeLogTool {
 				chunk = logMsg.substring(idx, idx + substrSize);

 				switch (ltarg) {

 					case Info:

-						bytesWritten = Log.i(source, chunk);

+						Log.i(source, chunk);

 						break;

 					case Warning:

-						bytesWritten = Log.w(source, chunk);

+						Log.w(source, chunk);

 						break;

 					case Error:

-						bytesWritten = Log.e(source, chunk, null);

+						Log.e(source, chunk, null);

 						break;

 				}

-				if (bytesWritten < chunk.length()) {

-					Log.w(TAG, "Calling Log.e: msg length=" + chunk.length() + ", bytesWritten=" + bytesWritten);

-				}

 			}			

 		} catch (Exception ex) {

 			Log.e(TAG, "Failure writing " + ltarg.name() + " fragments to android log:" + ex.toString(), null);

diff --git a/hello_sdl_java/src/main/java/com/smartdevicelink/java/Main.java b/hello_sdl_java/src/main/java/com/smartdevicelink/java/Main.java
index daa94f21a..dc1ce2457 100644
--- a/hello_sdl_java/src/main/java/com/smartdevicelink/java/Main.java
+++ b/hello_sdl_java/src/main/java/com/smartdevicelink/java/Main.java
@@ -43,6 +43,9 @@ public class Main {
     static SdlService sdlService;
 
     public static void main(String[] args) {
+        //Enable DebugTool
+        DebugTool.enableDebugTool();
+
         mainThread = Thread.currentThread();
         LOCK = new Object();
         startSdlService();
diff --git a/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java b/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
index 00fc9aea4..09e03c5fb 100644
--- a/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
+++ b/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
@@ -32,5 +32,5 @@ package com.smartdevicelink;
 
 // THIS FILE IS AUTO GENERATED, DO NOT MODIFY!!
 public final class BuildConfig {
-    public static final String VERSION_NAME = "4.12.0-RC";
-}
\ No newline at end of file
+    public static final String VERSION_NAME = "4.12.0";
+}
diff --git a/javaSE/src/main/java/com/smartdevicelink/util/Log.java b/javaSE/src/main/java/com/smartdevicelink/util/Log.java
index 914ce6366..2de00692c 100644
--- a/javaSE/src/main/java/com/smartdevicelink/util/Log.java
+++ b/javaSE/src/main/java/com/smartdevicelink/util/Log.java
@@ -1,22 +1,19 @@
 package com.smartdevicelink.util;
 
 public class Log {
-    public static int i(String tag, String message) {
+    public static void i(String tag, String message) {
         System.out.print("\r\nINFO: " + tag + " - " + message);
-        return 10;
     }
 
-    public static int w(String tag, String message) {
+    public static void w(String tag, String message) {
         System.out.print("\r\nWARN: " + tag + " - " + message);
-        return 10;
     }
 
-    public static int e(String tag, String message, Throwable t) {
+    public static void e(String tag, String message, Throwable t) {
         if (t != null) {
             System.out.print("\r\nERROR: " + tag + " - " + message + " - " + t.getMessage());
         } else {
             System.out.print("\r\nERROR: " + tag + " - " + message);
         }
-        return 10;
     }
 }
\ No newline at end of file