Skip to content

Commit 903d3b8

Browse files
Return correct bytesWritten in log methods
1 parent 82b7a3d commit 903d3b8

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

  • android/sdl_android/src/main/java/com/smartdevicelink/util
  • base/src/main/java/com/smartdevicelink/util
  • hello_sdl_java/src/main/java/com/smartdevicelink/java
  • javaSE/src/main/java/com/smartdevicelink/util

android/sdl_android/src/main/java/com/smartdevicelink/util/Log.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,18 @@
22

33
public class Log {
44
public static int i(String tag, String message) {
5-
android.util.Log.i(tag, message);
6-
return 10;
5+
return android.util.Log.i(tag, message);
76
}
87

98
public static int w(String tag, String message) {
10-
android.util.Log.w(tag, message);
11-
return 10;
9+
return android.util.Log.w(tag, message);
1210
}
1311

1412
public static int e(String tag, String message, Throwable t) {
1513
if (t != null) {
16-
android.util.Log.e(tag, message, t);
14+
return android.util.Log.e(tag, message, t);
1715
} else {
18-
android.util.Log.e(tag, message);
16+
return android.util.Log.e(tag, message);
1917
}
20-
return 10;
2118
}
2219
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private static boolean log(LogTarget ltarg, String source, String logMsg) {
128128
break;
129129
}
130130
if (bytesWritten < chunk.length()) {
131-
Log.w(TAG, "Calling Log.e: msg length=" + chunk.length() + ", bytesWritten=" + bytesWritten);
131+
Log.w(TAG, "Calling Log.w: msg length=" + chunk.length() + ", bytesWritten=" + bytesWritten);
132132
}
133133
}
134134
} catch (Exception ex) {

hello_sdl_java/src/main/java/com/smartdevicelink/java/Main.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ public class Main {
4343
static SdlService sdlService;
4444

4545
public static void main(String[] args) {
46+
//Enable DebugTool
47+
DebugTool.enableDebugTool();
48+
4649
mainThread = Thread.currentThread();
4750
LOCK = new Object();
4851
startSdlService();

javaSE/src/main/java/com/smartdevicelink/util/Log.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
public class Log {
44
public static int i(String tag, String message) {
55
System.out.print("\r\nINFO: " + tag + " - " + message);
6-
return 10;
6+
return 4000;
77
}
88

99
public static int w(String tag, String message) {
1010
System.out.print("\r\nWARN: " + tag + " - " + message);
11-
return 10;
11+
return 4000;
1212
}
1313

1414
public static int e(String tag, String message, Throwable t) {
@@ -17,6 +17,6 @@ public static int e(String tag, String message, Throwable t) {
1717
} else {
1818
System.out.print("\r\nERROR: " + tag + " - " + message);
1919
}
20-
return 10;
20+
return 4000;
2121
}
2222
}

0 commit comments

Comments
 (0)