Skip to content

Commit 3c00210

Browse files
authored
Merge pull request #554 from echooo10/bugfix/#421
fix issue #421 StartupTracer不兼容AndroidX问题
2 parents 8358a7c + 5dd6f0a commit 3c00210

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

matrix/matrix-android/matrix-gradle-plugin/src/main/java/com/tencent/matrix/trace/MethodTracer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,8 @@ private boolean isActivityOrSubClass(String className, ConcurrentHashMap<String,
366366
className = className.replace(".", "/");
367367
boolean isActivity = className.equals(TraceBuildConstants.MATRIX_TRACE_ACTIVITY_CLASS)
368368
|| className.equals(TraceBuildConstants.MATRIX_TRACE_V4_ACTIVITY_CLASS)
369-
|| className.equals(TraceBuildConstants.MATRIX_TRACE_V7_ACTIVITY_CLASS);
369+
|| className.equals(TraceBuildConstants.MATRIX_TRACE_V7_ACTIVITY_CLASS)
370+
|| className.equals(TraceBuildConstants.MATRIX_TRACE_ANDROIDX_ACTIVITY_CLASS);
370371
if (isActivity) {
371372
return true;
372373
} else {

matrix/matrix-android/matrix-gradle-plugin/src/main/java/com/tencent/matrix/trace/TraceBuildConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class TraceBuildConstants {
3030
public final static String MATRIX_TRACE_ACTIVITY_CLASS = "android/app/Activity";
3131
public final static String MATRIX_TRACE_V7_ACTIVITY_CLASS = "android/support/v7/app/AppCompatActivity";
3232
public final static String MATRIX_TRACE_V4_ACTIVITY_CLASS = "android/support/v4/app/FragmentActivity";
33+
public final static String MATRIX_TRACE_ANDROIDX_ACTIVITY_CLASS = "androidx/appcompat/app/AppCompatActivity";
3334
public final static String MATRIX_TRACE_APPLICATION_CLASS = "android/app/Application";
3435
public final static String MATRIX_TRACE_METHOD_BEAT_CLASS = "com/tencent/matrix/trace/core/AppMethodBeat";
3536
public final static String MATRIX_TRACE_ON_WINDOW_FOCUS_METHOD_ARGS = "(Z)V";

0 commit comments

Comments
 (0)