From 862988be2a19847d551ed9bd15b71e802022ee7b Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Thu, 30 Sep 2021 07:48:11 +0800
Subject: [PATCH] [parasitic] Fix autofill timeout (#1192)

---
 core/build.gradle.kts                                           | 2 +-
 core/src/main/java/org/lsposed/lspd/service/ConfigManager.java  | 1 +
 .../main/java/org/lsposed/lspd/util/ParasiticManagerHooker.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 5f288955..8baa5f4c 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -231,7 +231,7 @@ androidComponents.onVariants { v ->
             filter<ReplaceTokens>("tokens" to tokens)
             filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf"))
         }
-        from("${project(":app").buildDir}/${if (rootProject.extra.properties["android.injected.invoked.from.ide"] == "true") "intermediates" else "outputs"}/apk/${variantLowered}") {
+        from("${project(":app").buildDir}/outputs/apk/${variantLowered}") {
             include("*.apk")
             rename(".*\\.apk", "manager.apk")
         }
diff --git a/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
index 3a1bc5f4..a208ce24 100644
--- a/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
+++ b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
@@ -237,6 +237,7 @@ public class ConfigManager {
             if (info != null) {
                 managerUid = info.applicationInfo.uid;
             } else {
+                managerUid = -1;
                 Log.i(TAG, "manager is not installed");
             }
         } catch (RemoteException ignored) {
diff --git a/core/src/main/java/org/lsposed/lspd/util/ParasiticManagerHooker.java b/core/src/main/java/org/lsposed/lspd/util/ParasiticManagerHooker.java
index 74e41209..8aebe882 100644
--- a/core/src/main/java/org/lsposed/lspd/util/ParasiticManagerHooker.java
+++ b/core/src/main/java/org/lsposed/lspd/util/ParasiticManagerHooker.java
@@ -117,7 +117,7 @@ public class ParasiticManagerHooker {
                     if (param.args[i] instanceof Intent) {
                         var intent = (Intent) param.args[i];
                         checkIntent(managerService, intent);
-                        intent.setComponent(new ComponentName(BuildConfig.MANAGER_INJECTED_PKG_NAME, "org.lsposed.manager.ui.activity.MainActivity"));
+                        intent.setComponent(new ComponentName(intent.getComponent().getPackageName(), "org.lsposed.manager.ui.activity.MainActivity"));
                     }
                 }
             }