Skip to content

Commit 3f0551e

Browse files
authored
Merge pull request #603 from Tencent/hotfix/1.0.0
fix checkstyle
2 parents aad2f05 + 9eb07d2 commit 3f0551e

File tree

4 files changed

+14
-18
lines changed

4 files changed

+14
-18
lines changed

matrix/matrix-android/matrix-backtrace/src/main/java/com/tencent/components/backtrace/WarmUpDelegate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ boolean isBacktraceThreadBlocked() {
128128
return true;
129129
}
130130

131-
public void setSavingPath(String savingPath) {
131+
void setSavingPath(String savingPath) {
132132
mSavingPath = savingPath;
133133
WeChatBacktraceNative.setSavingPath(savingPath);
134134
}

matrix/matrix-android/matrix-backtrace/src/main/java/com/tencent/components/backtrace/WeChatBacktrace.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,10 @@
1919
import android.content.Context;
2020
import android.os.Build;
2121

22-
2322
import com.tencent.matrix.util.MatrixLog;
2423

2524
import java.io.File;
26-
import java.util.ArrayList;
2725
import java.util.HashSet;
28-
import java.util.List;
2926

3027
import static com.tencent.components.backtrace.WarmUpScheduler.DELAY_SHORTLY;
3128

@@ -264,7 +261,7 @@ public static boolean hasWarmedUp(Context context) {
264261
return WarmUpUtility.hasWarmedUp(context);
265262
}
266263

267-
public static int[] _DoStatistic(String pathOfSo) {
264+
public static int[] doStatistic(String pathOfSo) {
268265
return WeChatBacktraceNative.statistic(pathOfSo);
269266
}
270267

@@ -495,8 +492,7 @@ public String toString() {
495492
">>> Enable Isolate Process logger: " + mEnableIsolateProcessLog + "\n" +
496493
">>> Path of XLog: " + mPathOfXLogSo + "\n" +
497494
">>> Cool-down: " + mCoolDown + "\n" +
498-
">>> Cool-down if Apk Updated: " + mCoolDownIfApkUpdated + "\n"
499-
;
495+
">>> Cool-down if Apk Updated: " + mCoolDownIfApkUpdated + "\n";
500496
}
501497

502498
}

matrix/matrix-android/matrix-backtrace/src/main/java/com/tencent/components/backtrace/WeChatBacktraceNative.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,36 +69,36 @@ public class WeChatBacktraceNative {
6969
/**
7070
* Warm-up specific so file path.
7171
*
72-
* @param so_path
72+
* @param soPath
7373
*/
7474
@Keep
75-
static native boolean warmUp(String so_path, int elf_start_offset, boolean only_save_file);
75+
static native boolean warmUp(String soPath, int elfStartOffset, boolean onlySaveFile);
7676

7777
/**
7878
* Notify warmed-up elf file to native library.
7979
*
80-
* @param so_path
81-
* @param elf_start_offset
80+
* @param soPath
81+
* @param elfStartOffset
8282
*/
8383
@Keep
84-
static native void notifyWarmedUp(String so_path, int elf_start_offset);
84+
static native void notifyWarmedUp(String soPath, int elfStartOffset);
8585

8686
/**
8787
* Test loading qut.
8888
*
89-
* @param so_path
90-
* @param elf_start_offset
89+
* @param soPath
90+
* @param elfStartOffset
9191
*/
9292
@Keep
93-
static native boolean testLoadQut(String so_path, int elf_start_offset);
93+
static native boolean testLoadQut(String soPath, int elfStartOffset);
9494

9595
/**
9696
* Some statistic.
9797
*
98-
* @param so_path
98+
* @param soPath
9999
*/
100100
@Keep
101-
static native int[] statistic(String so_path);
101+
static native int[] statistic(String soPath);
102102

103103
/**
104104
* Generate quicken table immediately while stepping stack.

matrix/matrix-android/test/test-backtrace/src/main/java/com/tencent/wxperf/sample/BenchmarkActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ public boolean accept(File file) {
289289
if (file.getName().endsWith(".so") || file.getName().endsWith(".oat")
290290
|| file.getName().endsWith(".odex")) {
291291
Log.e(TAG, "Start statistics -> " + file.getAbsolutePath());
292-
int[] result = WeChatBacktrace._DoStatistic(file.getAbsolutePath());
292+
int[] result = WeChatBacktrace.doStatistic(file.getAbsolutePath());
293293
maps.put(file.getName(), result);
294294
Log.e(TAG,
295295
"Start statistics <- " + file.getAbsolutePath() + " end.");

0 commit comments

Comments
 (0)