From bc0632aa2566b7979ebefc12ded668aac52439e6 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 30 Nov 2023 17:46:51 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0][=E6=8A=80=E6=9C=AF=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=20=E7=A6=81=E7=94=A8xcrash=E7=9A=84=E5=B4=A9=E6=BA=83=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=EF=BC=9B=E7=A7=BB=E9=99=A4=E5=8D=A1=E9=A1=BF=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E7=9A=84=E9=93=BE=E8=B7=AF=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jank/compiler/JankPointAutoGenerator.java | 8 +++++ .../lancet/jank/spi/HookInvokerImpl.java | 33 ++++++++++--------- .../block/MoGoBlockProviderImpl.kt | 4 +-- .../logcat/MoGoLogRecordProviderImpl.kt | 2 +- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java b/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java index a95ffe309a..fd67f0e4cc 100644 --- a/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java +++ b/app/src/debug/java/com/mogo/launcher/lancet/jank/compiler/JankPointAutoGenerator.java @@ -9,6 +9,7 @@ import android.content.BroadcastReceiver; import android.content.ContentProvider; import android.content.pm.PackageManager; import android.graphics.BitmapFactory; +import android.net.ConnectivityManager; import android.opengl.GLSurfaceView; import android.os.SystemClock; import android.view.View; @@ -42,6 +43,13 @@ class JankPointAutoGenerator { ) private PackageManager pm; + @LancetXGenerator( + group = "main_block_check", + type = Type.IPC, + hookAllPublicMethods = true + ) + private ConnectivityManager cm; + @LancetXGenerator( group = "main_block_check", type = Type.ACTIVITY, diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java b/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java index 14c0adcd81..fd8142f40b 100644 --- a/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java +++ b/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java @@ -167,8 +167,9 @@ public class HookInvokerImpl implements IHookInvoker { } builder.setLength(builder.length() - 1); } + VLog.w("HookHandler", "Junk Detected:" + builder); - linkedLog(type, builder.toString()); + // linkedLog(type, builder.toString()); if (flag) { extra.setLength(0); } @@ -284,19 +285,19 @@ public class HookInvokerImpl implements IHookInvoker { } } - private void linkedLog(Type type, String msg) { - try { - linkedLogInternal(type,msg); - } catch (Throwable t) { - t.printStackTrace(); - } - } - - @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_ANR_LEAK, - linkCode = ChainConstant.CHAIN_SOURCE_HMI, - nodeAliasCode = ChainConstant.CHAIN_CODE_MAIN_BLOCK, - paramIndexes = { 0, 1 } - ) - private void linkedLogInternal(Type type, String msg) {} +// private void linkedLog(Type type, String msg) { +// try { +// linkedLogInternal(type,msg); +// } catch (Throwable t) { +// t.printStackTrace(); +// } +// } +// +// @ChainLog( +// linkChainLog = ChainConstant.CHAIN_TYPE_ANR_LEAK, +// linkCode = ChainConstant.CHAIN_SOURCE_HMI, +// nodeAliasCode = ChainConstant.CHAIN_CODE_MAIN_BLOCK, +// paramIndexes = { 0, 1 } +// ) +// private void linkedLogInternal(Type type, String msg) {} } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt index 0f3340cf49..0531d0698c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt @@ -25,7 +25,7 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener { @Volatile private var hasInit = false - private val linkedLog by lazy { MainBlockLinkedLog() } +// private val linkedLog by lazy { MainBlockLinkedLog() } override fun init(ctx: Context) { BlockDetector.init(BlockMetrics.Builder() @@ -75,7 +75,7 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener { } catch (t: Throwable) { Log.e(TAG, "onDumped error", t) } - linkedLog.record(msg) +// linkedLog.record(msg) } }) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt index fd87bac403..6dbe5d527d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt @@ -104,7 +104,7 @@ internal class MoGoLogRecordProviderImpl: IMoGoLogRecordProvider, } }) .crashConfig(CrashConfig.Builder() - .enabled(true) + .enabled(false) .crashDir(File(context.getExternalFilesDir(null), "logcat/crash")) .javaCrash(true) .anr(true)