fix merge duplicate code

jeffli678 · Dec 31, 2018 · 94220cc · 94220cc
1 parent c0753dc
commit 94220cc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/mars/libraries/mars_android_sdk/src/main/java/com/tencent/mars/xlog/Xlog.java b/mars/libraries/mars_android_sdk/src/main/java/com/tencent/mars/xlog/Xlog.java
@@ -101,4 +101,3 @@ public void logF(String tag, String filename, String funcname, int line, int pid
 	public native void appenderFlush(boolean isSync);
 
 }
-
diff --git a/mars/libraries/mars_xlog_sdk/src/main/java/com/tencent/mars/xlog/Xlog.java b/mars/libraries/mars_xlog_sdk/src/main/java/com/tencent/mars/xlog/Xlog.java
@@ -94,13 +94,6 @@ public void logF(String tag, String filename, String funcname, int line, int pid
 	 */
 	public static native void setMaxAliveTime(long duration);
 
-	public static native void setMaxFileSize(long size);
-
-	/**
-	 * should be called before appenderOpen to take effect
-	 * @param duration alive seconds
-	 */
-	public static native void setMaxAliveTime(long duration);
 	@Override
 	public native void appenderClose();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -101,4 +101,3 @@ public void logF(String tag, String filename, String funcname, int line, int pid
		public native void appenderFlush(boolean isSync);

		}