Merge pull request #1411 from smartdevicelink/bugfix/fix_logrelease/4.12-RC

Fix loggin issue in DebugTool

4 files changed, 12 insertions, 19 deletions

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/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