From 9981ec9699c970cbf6cac7fc6103041b08d2bfbe Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Tue, 21 Nov 2023 17:12:41 +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=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt    | 8 ++++----
 .../mogo/launcher/lancet/jank/spi/HookInvokerImpl.java    | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt b/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt
index d2f6b9fbaa..204ccf8a5d 100644
--- a/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt
+++ b/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HandlerHookerImpl.kt
@@ -72,11 +72,11 @@ class HandlerHookerImpl : IHandlerHooker {
     }
 
     override fun onPostAtTime(handler: Handler, action: Runnable, token: Any?, uptimeMillis: Long) {
-        checkIfNeed(handler)?.insert(Msg.acquire(handler, action = action, obj = token, delay = uptimeMillis - SystemClock.uptimeMillis()))
+        checkIfNeed(handler)?.insert(Msg.acquire(handler, action = action, obj = token, enqueue = uptimeMillis))
     }
 
     override fun onPostAtTime(handler: Handler, action: Runnable, uptimeMillis: Long) {
-        checkIfNeed(handler)?.insert(Msg.acquire(handler, action = action, delay = uptimeMillis - SystemClock.uptimeMillis()))
+        checkIfNeed(handler)?.insert(Msg.acquire(handler, action = action, enqueue = uptimeMillis))
     }
 
     override fun onPostDelayed(handler: Handler, action: Runnable, token: Any?, delayMillis: Long) {
@@ -93,7 +93,7 @@ class HandlerHookerImpl : IHandlerHooker {
     }
 
     override fun onSendEmptyMessageAtTime(handler: Handler, what: Int, uptimeMillis: Long) {
-        checkIfNeed(handler)?.insert(Msg.acquire(handler, what = what, delay = uptimeMillis - SystemClock.uptimeMillis()))
+        checkIfNeed(handler)?.insert(Msg.acquire(handler, what = what, enqueue = uptimeMillis))
     }
 
     override fun onSendEmptyMessageDelayed(handler: Handler, what: Int, delayMillis: Long) {
@@ -109,7 +109,7 @@ class HandlerHookerImpl : IHandlerHooker {
     }
 
     override fun onSendMessageAtTime(handler: Handler, msg: Message, uptimeMillis: Long) {
-        checkIfNeed(handler)?.insert(Msg.acquire(handler, msg = msg, delay = uptimeMillis - SystemClock.uptimeMillis()))
+        checkIfNeed(handler)?.insert(Msg.acquire(handler, msg = msg, enqueue = uptimeMillis))
     }
 
     override fun onSendMessageDelayed(handler: Handler, msg: Message, delayMillis: Long) {
diff --git a/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java b/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java
index 62593b36d9..2557988cc3 100644
--- a/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java
+++ b/app/src/main/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java
@@ -46,10 +46,7 @@ public class HookInvokerImpl implements IHookInvoker {
     @Override
     public void i(Type type, Object caller,String methodName, Object... objects) {
         startTime.set(SystemClock.elapsedRealtime());
-        boolean isMainThread = false;
-        if (mainLooper == Looper.myLooper()) {
-            isMainThread = true;
-        }
+        boolean isMainThread = mainLooper == Looper.myLooper();
         handleSynchronizedLock(isMainThread, caller, methodName, objects);
         if (!getProviderRequested && provider == null && mainLooper != Looper.myLooper() && ARouterUtils.isInit.get()) {
             getProviderRequested = true;