Merge pull request #1411 from smartdevicelink/bugfix/fix_log

Fix loggin issue in DebugTool

Author: Robert Henigan

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;
     }
 }

base/src/main/java/com/smartdevicelink/util/NativeLogTool.java

@@ -109,7 +109,6 @@ private static boolean log(LogTarget ltarg, String source, String logMsg) {
 			return false;
 		}
 
-		int bytesWritten = 0;
 		int substrSize = 0;
 		String chunk = null;
 		try {
@@ -118,18 +117,15 @@ private static boolean log(LogTarget ltarg, String source, String logMsg) {
 				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);

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();

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;
     }
 }