From 06c94a142b9d9b24366abbfe9be2840573e6acca Mon Sep 17 00:00:00 2001
From: meiming <260548893@qq.com>
Date: Fri, 11 Oct 2019 20:23:20 +0800
Subject: [PATCH 1/2] fix duplicate key in matrix config file

---
 .../src/main/java/com/tencent/matrix/matrix-config.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix/matrix-android/matrix-android-lib/src/main/java/com/tencent/matrix/matrix-config.xml b/matrix/matrix-android/matrix-android-lib/src/main/java/com/tencent/matrix/matrix-config.xml
index 314533573..7f577c6a0 100644
--- a/matrix/matrix-android/matrix-android-lib/src/main/java/com/tencent/matrix/matrix-config.xml
+++ b/matrix/matrix-android/matrix-android-lib/src/main/java/com/tencent/matrix/matrix-config.xml
@@ -87,7 +87,7 @@
     <!-- 是否开启文件IO重复读监控，默认为true -->
     <FileIORepeatReadEnable>true</FileIORepeatReadEnable>
     <!-- 指定重复读次数阈值，默认为5次 -->
-    <FileIORepeatReadEnable>5</FileIORepeatReadEnable>
+    <FileIORepeatReadThreshold>5</FileIORepeatReadThreshold>
     <!-- 是否开启CloseableLeak监控，默认为true -->
     <CloseableLeakEnable>true</CloseableLeakEnable>
 </IOCanary>

From 404d426c9fa449665094469200684d41ea18eec9 Mon Sep 17 00:00:00 2001
From: meiming <260548893@qq.com>
Date: Fri, 15 May 2020 11:08:41 +0800
Subject: [PATCH 2/2] fix isBelongFrame status error in dispatchEnd, because is
 will change in doFrameEnd

---
 .../com/tencent/matrix/trace/core/UIThreadMonitor.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/core/UIThreadMonitor.java b/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/core/UIThreadMonitor.java
index 8dfb6604f..ab79a7da2 100644
--- a/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/core/UIThreadMonitor.java
+++ b/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/core/UIThreadMonitor.java
@@ -249,8 +249,9 @@ private void doFrameEnd(long token) {
     }
 
     private void dispatchEnd() {
+        final boolean localBelongFrame = isBelongFrame;
 
-        if (isBelongFrame) {
+        if (localBelongFrame) {
             doFrameEnd(token);
         }
 
@@ -260,7 +261,7 @@ private void dispatchEnd() {
         synchronized (observers) {
             for (LooperObserver observer : observers) {
                 if (observer.isDispatchBegin()) {
-                    observer.doFrame(AppMethodBeat.getVisibleScene(), token, SystemClock.uptimeMillis(), isBelongFrame ? end - start : 0, queueCost[CALLBACK_INPUT], queueCost[CALLBACK_ANIMATION], queueCost[CALLBACK_TRAVERSAL]);
+                    observer.doFrame(AppMethodBeat.getVisibleScene(), token, SystemClock.uptimeMillis(), localBelongFrame ? end - start : 0, queueCost[CALLBACK_INPUT], queueCost[CALLBACK_ANIMATION], queueCost[CALLBACK_TRAVERSAL]);
                 }
             }
         }
@@ -273,7 +274,7 @@ private void dispatchEnd() {
         synchronized (observers) {
             for (LooperObserver observer : observers) {
                 if (observer.isDispatchBegin()) {
-                    observer.dispatchEnd(dispatchTimeMs[0], dispatchTimeMs[2], dispatchTimeMs[1], dispatchTimeMs[3], token, isBelongFrame);
+                    observer.dispatchEnd(dispatchTimeMs[0], dispatchTimeMs[2], dispatchTimeMs[1], dispatchTimeMs[3], token, localBelongFrame);
                 }
             }
         }