Merge branch 'dev_robotaxi-d_231031_6.2.0' into 6.2.0_merge_master

# Conflicts:
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
This commit is contained in:
yangyakun
2023-12-04 11:53:10 +08:00
9 changed files with 82 additions and 17 deletions

View File

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.os.HandlerCompat;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.config.JunkConfig;
import com.mogo.eagle.core.function.api.devatools.perf.IMoGoCpuUsageProvider;
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
import com.mogo.eagle.core.function.main.ARouterUtils;
@@ -29,7 +29,7 @@ public class ThreadOptInitializer {
@Override
public boolean isEnabled() {
return FunctionBuildConfig.isSupportJunkDetect;
return JunkConfig.isSupportJunkDetect;
}