Merge pull request #604 from Tencent/hotfix/1.0.0

Hotfix/1.0.0
Tencent · Jun 10, 2021 · b7b4864 · b7b4864
2 parents 3f0551e + 5b8dadb
commit b7b4864
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 30 deletions.
diff --git a/matrix/matrix-android/gradle/WeChatPublish.gradle b/matrix/matrix-android/gradle/WeChatPublish.gradle
@@ -583,3 +583,4 @@ class WeChatAndroidLibraryPublishExtension extends WeChatPublishExtension {
         }
     }
 }
+apply from: rootProject.file('gradle/check.gradle')
diff --git a/matrix/matrix-android/gradle/check.gradle b/matrix/matrix-android/gradle/check.gradle
@@ -13,15 +13,20 @@ checkstyle {
 task('checkstyle', type: Checkstyle) {
     source 'src/main/java'
     include '**/*.java'
+    include '**/*.kt'
     classpath = files()
 }
 
-if ("External" != rootProject.ext.PUBLISH_CHANNEL) {
+//if ("External" != rootProject.ext.PUBLISH_CHANNEL) {
     project.afterEvaluate {
-        project.publish.dependsOn("checkstyle")
-        project.publishToMavenLocal.dependsOn("checkstyle")
+//        project.publish.dependsOn("checkstyle")
+//        project.publishToMavenLocal.dependsOn("checkstyle")
+        project.build.dependsOn("checkstyle")
+        if (project.plugins.hasPlugin("com.android.application") || project.plugins.hasPlugin("com.android.library")) {
+            project.preBuild.dependsOn("checkstyle")
+        }
     }
-}
+//}
 check.dependsOn('checkstyle')
 
 

diff --git a/...droid/matrix-backtrace/src/main/java/com/tencent/components/backtrace/WarmUpDelegate.java b/...droid/matrix-backtrace/src/main/java/com/tencent/components/backtrace/WarmUpDelegate.java
@@ -550,15 +550,15 @@ final static class ThreadTaskExecutor implements Runnable, Handler.Callback {
 
         private boolean mThreadBlocked = false;
 
-        public ThreadTaskExecutor(String threadName) {
+        ThreadTaskExecutor(String threadName) {
             mThreadName = threadName;
         }
 
-        public boolean isThreadBlocked() {
+        boolean isThreadBlocked() {
             return mThreadBlocked;
         }
 
-        public void arrangeTask(Runnable runnable, String tag) {
+        void arrangeTask(Runnable runnable, String tag) {
             synchronized (mTaskQueue) {
                 if (mTaskQueue.contains(tag)) {
                     return;

diff --git a/...c/main/java/com/tencent/matrix/batterycanary/monitor/feature/BlueToothMonitorFeature.java b/...c/main/java/com/tencent/matrix/batterycanary/monitor/feature/BlueToothMonitorFeature.java
@@ -2,11 +2,11 @@
 
 import android.bluetooth.le.ScanSettings;
 import android.os.Build;
+import android.text.TextUtils;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.text.TextUtils;
 
-import com.tencent.matrix.batterycanary.monitor.BatteryMonitorConfig;
 import com.tencent.matrix.batterycanary.utils.BatteryCanaryUtil;
 import com.tencent.matrix.batterycanary.utils.BluetoothManagerServiceHooker;
 import com.tencent.matrix.util.MatrixLog;

diff --git a/matrix/matrix-android/matrix-hooks/src/main/java/com/tencent/matrix/hook/HookManager.java b/matrix/matrix-android/matrix-hooks/src/main/java/com/tencent/matrix/hook/HookManager.java
@@ -33,10 +33,10 @@ public class HookManager {
 
     public static final HookManager INSTANCE = new HookManager();
 
-    private volatile boolean hasHooked;
-    private Set<AbsHook> mHooks = new HashSet<>();
+    private volatile boolean      hasHooked;
+    private          Set<AbsHook> mHooks = new HashSet<>();
 
-    private HookManager(){
+    private HookManager() {
     }
 
     private void exclusiveHook() {
@@ -114,8 +114,11 @@ public boolean hasHooked() {
     }
 
     private native int xhookRefreshNative(boolean async);
+
     private native void xhookEnableDebugNative(boolean flag);
+
     private native void xhookEnableSigSegvProtectionNative(boolean flag);
+
     private native void xhookClearNative();
 
     public static class HookFailedException extends Exception {

diff --git a/...d/matrix-io-canary/src/main/java/com/tencent/matrix/iocanary/detect/CloseGuardHooker.java b/...d/matrix-io-canary/src/main/java/com/tencent/matrix/iocanary/detect/CloseGuardHooker.java
@@ -17,6 +17,8 @@
 package com.tencent.matrix.iocanary.detect;
 
 
+import android.annotation.SuppressLint;
+
 import com.tencent.matrix.report.IssuePublisher;
 import com.tencent.matrix.util.MatrixLog;
 
@@ -75,6 +77,7 @@ private boolean tryHook() {
         try {
             Class<?> closeGuardCls = Class.forName("dalvik.system.CloseGuard");
             Class<?> closeGuardReporterCls = Class.forName("dalvik.system.CloseGuard$Reporter");
+            @SuppressLint("SoonBlockedPrivateApi") // FIXME
             Method methodGetReporter = closeGuardCls.getDeclaredMethod("getReporter");
             Method methodSetReporter = closeGuardCls.getDeclaredMethod("setReporter", closeGuardReporterCls);
             Method methodSetEnabled = closeGuardCls.getDeclaredMethod("setEnabled", boolean.class);

diff --git a/.../matrix-trace-canary/src/main/java/com/tencent/matrix/trace/listeners/IDefaultConfig.java b/.../matrix-trace-canary/src/main/java/com/tencent/matrix/trace/listeners/IDefaultConfig.java
@@ -23,7 +23,7 @@
 public interface IDefaultConfig {
 
     boolean isAppMethodBeatEnable();
-    
+
     boolean isFPSEnable();
 
     boolean isEvilMethodTraceEnable();

diff --git a/matrix/matrix-android/test/test-backtrace/src/main/res/layout/activity_demo.xml b/matrix/matrix-android/test/test-backtrace/src/main/res/layout/activity_demo.xml
@@ -16,8 +16,8 @@
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
         android:text="@string/usage"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/btn_wechat_backtrace_try"
@@ -26,8 +26,8 @@
         android:onClick="backtraceTry"
         android:text="Backtrace Have A Try"
         android:textAllCaps="false"
-        app:layout_constraintTop_toBottomOf="@+id/textview_bactrace_usage"
-        />
+        app:layout_constraintStart_toStartOf="@+id/textview_bactrace_usage"
+        app:layout_constraintTop_toBottomOf="@+id/textview_bactrace_usage" />
 
     <Button
         android:id="@+id/btn_wechat_backtrace_benchmark"
@@ -37,8 +37,8 @@
         android:onClick="backtraceBenchmark"
         android:text="Backtrace Benchmark"
         android:textAllCaps="false"
-        app:layout_constraintTop_toBottomOf="@+id/btn_wechat_backtrace_try"
-        />
+        app:layout_constraintStart_toStartOf="@+id/btn_wechat_backtrace_try"
+        app:layout_constraintTop_toBottomOf="@+id/btn_wechat_backtrace_try" />
 
     <Button
         android:id="@+id/btn_wechat_backtrace_benchmark_with_jit"
@@ -48,8 +48,8 @@
         android:onClick="backtraceBenchmarkWithJit"
         android:text="Backtrace Benchmark(With Jit)"
         android:textAllCaps="false"
-        app:layout_constraintTop_toBottomOf="@+id/btn_wechat_backtrace_benchmark"
-        />
+        app:layout_constraintStart_toStartOf="@+id/btn_wechat_backtrace_benchmark"
+        app:layout_constraintTop_toBottomOf="@+id/btn_wechat_backtrace_benchmark" />
 
     <Button
         android:id="@+id/btn_wechat_backtrace_benchmark_for_java"
@@ -59,16 +59,17 @@
         android:onClick="backtraceBenchmarkForJava"
         android:text="Java Backtrace Benchmark"
         android:textAllCaps="false"
-        app:layout_constraintTop_toBottomOf="@+id/btn_wechat_backtrace_benchmark_with_jit"
-        />
+        app:layout_constraintStart_toStartOf="@+id/btn_wechat_backtrace_benchmark_with_jit"
+        app:layout_constraintTop_toBottomOf="@+id/btn_wechat_backtrace_benchmark_with_jit" />
 
     <View
         android:id="@+id/horizontal_line_1"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginTop="32dp"
-        app:layout_constraintTop_toBottomOf="@+id/btn_wechat_backtrace_benchmark_for_java"
-        android:background="#c0c0c0"/>
+        android:background="#c0c0c0"
+        app:layout_constraintStart_toStartOf="@+id/btn_wechat_backtrace_benchmark_for_java"
+        app:layout_constraintTop_toBottomOf="@+id/btn_wechat_backtrace_benchmark_for_java" />
 
     <TextView
         android:id="@+id/textview_statistic_usage"
@@ -78,19 +79,18 @@
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
         android:text="@string/stat_usage"
-        app:layout_constraintTop_toBottomOf="@+id/horizontal_line_1"
-        />
+        app:layout_constraintStart_toStartOf="@+id/btn_wechat_backtrace_benchmark_for_java"
+        app:layout_constraintTop_toBottomOf="@+id/horizontal_line_1" />
 
     <Button
         android:id="@+id/btn_wechat_backtrace_statistics"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:onClick="doStatistics"
-        android:layout_marginBottom="8dp"
         android:text="Statistics"
         android:textAllCaps="false"
-        app:layout_constraintTop_toBottomOf="@+id/textview_statistic_usage"
-        />
+        app:layout_constraintStart_toStartOf="@+id/textview_statistic_usage"
+        app:layout_constraintTop_toBottomOf="@+id/textview_statistic_usage" />
 <!--    <Button-->
 <!--        android:id="@+id/btn_wechat_backtrace"-->
 <!--        android:layout_width="wrap_content"-->