diff --git a/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/config/TraceConfig.java b/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/config/TraceConfig.java index b050170de..ba04c4e05 100644 --- a/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/config/TraceConfig.java +++ b/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/config/TraceConfig.java @@ -97,13 +97,16 @@ public boolean isAnrTraceEnable() { public Set getSplashActivities() { if (null == splashActivitiesSet) { splashActivitiesSet = new HashSet<>(); - if (null == splashActivities) { - return splashActivitiesSet; - } if (null == dynamicConfig) { + if (null == splashActivities) { + return splashActivitiesSet; + } splashActivitiesSet.addAll(Arrays.asList(splashActivities.split(";"))); } else { splashActivities = dynamicConfig.get(IDynamicConfig.ExptEnum.clicfg_matrix_trace_care_scene_set.name(), splashActivities); + if (null == splashActivities) { + return splashActivitiesSet; + } splashActivitiesSet.addAll(Arrays.asList(splashActivities.split(";"))); } } diff --git a/matrix/matrix-android/matrix-trace-canary/src/test/java/com/tencent/matrix/trace/config/TraceConfigTestCase.java b/matrix/matrix-android/matrix-trace-canary/src/test/java/com/tencent/matrix/trace/config/TraceConfigTestCase.java index 33a6322df..5e34d607b 100644 --- a/matrix/matrix-android/matrix-trace-canary/src/test/java/com/tencent/matrix/trace/config/TraceConfigTestCase.java +++ b/matrix/matrix-android/matrix-trace-canary/src/test/java/com/tencent/matrix/trace/config/TraceConfigTestCase.java @@ -60,12 +60,11 @@ public String get(String key, String defStr) { return super.get(key, defStr); } }).build() ; - Set activities = config.getSplashActivities() ; assertNotNull(activities); -// assertEquals(2, activities.size()); -// assertTrue( activities.contains("com.tencent.matrix.SplashActivity1")); -// assertTrue( activities.contains("com.tencent.matrix.SplashActivity2")); + assertEquals(2, activities.size()); + assertTrue( activities.contains("com.tencent.matrix.SplashActivity1")); + assertTrue( activities.contains("com.tencent.matrix.SplashActivity2")); } @@ -81,9 +80,9 @@ public void testSetSplashActivitiesWithTraceConfig() { Set activities = config.getSplashActivities() ; assertNotNull(activities); -// assertEquals(2, activities.size()); -// assertTrue( activities.contains("com.tencent.matrix.SplashActivity1")); -// assertTrue( activities.contains("com.tencent.matrix.SplashActivity2")); + assertEquals(2, activities.size()); + assertTrue( activities.contains("com.tencent.matrix.SplashActivity1")); + assertTrue( activities.contains("com.tencent.matrix.SplashActivity2")); } /**