TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-01-11 18:33:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix APK installation on Android P

Browse Source
This commit is contained in:
topjohnwu 2018-04-08 03:22:22 +08:00
parent 42284c5efb
commit 2533a4fc4a
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
native/jni/core/bootstages.c
View File

@ -124,15 +124,6 @@ static void bb_setenv(struct vector *v) {
vec_push_back(v, NULL); vec_push_back(v, NULL);
} }
static void pm_setenv(struct vector *v) {
for (int i = 0; environ[i]; ++i) {
if (strncmp(environ[i], "CLASSPATH=", 10) != 0)
vec_push_back(v, strdup(environ[i]));
}
vec_push_back(v, strdup("CLASSPATH=/system/framework/pm.jar"));
vec_push_back(v, NULL);
}
/*********** /***********
* Scripts * * Scripts *
***********/ ***********/
@ -651,11 +642,10 @@ core_only:
setfilecon("/data/magisk.apk", "u:object_r:su_file:s0"); setfilecon("/data/magisk.apk", "u:object_r:su_file:s0");
while (1) { while (1) {
sleep(5); sleep(5);
LOGD("apk_install: attempting to install APK");
int apk_res = -1, pid; int apk_res = -1, pid;
pid = exec_command(1, &apk_res, pm_setenv, pid = exec_command(1, &apk_res, NULL,
"app_process", "/system/bin/pm", "install", "-r", "/data/magisk.apk", NULL);
"/system/bin", "com.android.commands.pm.Pm",
"install", "-r", "/data/magisk.apk", NULL);
if (pid != -1) { if (pid != -1) {
int err = 0; int err = 0;
while (fdgets(buf, PATH_MAX, apk_res) > 0) { while (fdgets(buf, PATH_MAX, apk_res) > 0) {