From 649a986da855ac0e4429ab0c7a086750063a9575 Mon Sep 17 00:00:00 2001
From: Your Name <name>
Date: Wed, 29 Jun 2022 20:27:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fixBug:android8.0=E4=BB=A5=E4=B8=8B?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B8=A7=E7=8E=87=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/tencent/matrix/trace/tracer/FrameTracer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/FrameTracer.java b/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/FrameTracer.java
index 34a42b0d5..c408a1e6a 100644
--- a/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/FrameTracer.java
+++ b/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/FrameTracer.java
@@ -398,12 +398,11 @@ public void onActivityStarted(Activity activity) {
     @Override
     public void onActivityResumed(Activity activity) {
         lastResumeTimeMap.put(activity.getClass().getName(), System.currentTimeMillis());
-
+        this.refreshRate = (int) activity.getWindowManager().getDefaultDisplay().getRefreshRate();
         if (useFrameMetrics) {
             if (frameListenerMap.containsKey(activity.hashCode())) {
                 return;
             }
-            this.refreshRate = (int) activity.getWindowManager().getDefaultDisplay().getRefreshRate();
             this.frameIntervalNs = Constants.TIME_SECOND_TO_NANO / (long) refreshRate;
             Window.OnFrameMetricsAvailableListener onFrameMetricsAvailableListener = new Window.OnFrameMetricsAvailableListener() {
                 @RequiresApi(api = Build.VERSION_CODES.O)

From c53eb84d6ba1fbadf18400ff692ba63987e9530b Mon Sep 17 00:00:00 2001
From: Your Name <name>
Date: Wed, 29 Jun 2022 20:36:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20bug:FrameTracer=20=E5=B8=A7=E7=8E=87?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=B8=8D=E5=87=86=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/tencent/matrix/trace/tracer/FrameTracer.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/FrameTracer.java b/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/FrameTracer.java
index c408a1e6a..e4d676c69 100644
--- a/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/FrameTracer.java
+++ b/matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/FrameTracer.java
@@ -270,7 +270,7 @@ public void doReplayInner(String visibleScene, long startNs, long endNs, int dro
 
     private class FrameCollectItem {
         String visibleScene;
-        long sumFrameCost;
+        float sumFrameCost;
         int sumFrame = 0;
         int sumDroppedFrames;
         // record the level of frames dropped each time
@@ -306,7 +306,7 @@ void collect(int droppedFrames) {
         }
 
         void report() {
-            float fps = Math.min(refreshRate, 1000.f * sumFrame / sumFrameCost);
+            float fps = 1000.f * sumFrame / sumFrameCost;
             MatrixLog.i(TAG, "[report] FPS:%s %s", fps, toString());
             try {
                 TracePlugin plugin = Matrix.with().getPluginByClass(TracePlugin.class);