From a4c1ddd9f28e3190e1cca79141de69ed606e48df Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Sat, 15 Aug 2020 10:58:30 +0800
Subject: [PATCH] Use uid 2000 to install patched apk

---
 .../java/com/topjohnwu/magisk/core/utils/PatchAPK.kt   |  3 +--
 app/src/main/res/raw/manager.sh                        | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt
index 423a1df5d..0cb662d61 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt
@@ -130,8 +130,7 @@ object PatchAPK {
             return false
 
         // Install the application
-        repack.setReadable(true, false)
-        if (!Shell.su("pm install $repack").exec().isSuccess)
+        if (!Shell.su("adb_pm_install $repack").exec().isSuccess)
             return false
 
         Config.suManager = pkg.toString()
diff --git a/app/src/main/res/raw/manager.sh b/app/src/main/res/raw/manager.sh
index 08f223aba..a8502b872 100644
--- a/app/src/main/res/raw/manager.sh
+++ b/app/src/main/res/raw/manager.sh
@@ -85,6 +85,16 @@ EOF
   cd /
 }
 
+adb_pm_install() {
+  local tmp=/data/local/tmp/patched.apk
+  cp -f "$1" $tmp
+  chmod 644 $tmp
+  su 2000 -c pm install $tmp
+  local res=$?
+  rm -f $tmp
+  return $res
+}
+
 check_boot_ramdisk() {
   # Create boolean ISAB
   [ -z $SLOT ] && ISAB=false || ISAB=true