From 9a0b26e0b0ebdd10b341103d636ddd939dc418dd Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 15 Sep 2017 18:05:42 +0800 Subject: [PATCH] Proper FBE support --- MagiskManager | 2 +- jni/Android.mk | 1 - jni/daemon/bootstages.c | 2 ++ jni/su | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MagiskManager b/MagiskManager index b362c0ef3..b4ecd93f1 160000 --- a/MagiskManager +++ b/MagiskManager @@ -1 +1 @@ -Subproject commit b362c0ef3880a0044978de9a5207b4a50f7efc30 +Subproject commit b4ecd93f1c55eef81b8973c3470af42992833019 diff --git a/jni/Android.mk b/jni/Android.mk index 8dde96ec6..fbcb71591 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -53,7 +53,6 @@ LOCAL_SRC_FILES := \ su/su.c \ su/activity.c \ su/db.c \ - su/misc.c \ su/pts.c \ su/su_daemon.c \ su/su_socket.c diff --git a/jni/daemon/bootstages.c b/jni/daemon/bootstages.c index c82bf1967..c062d337c 100644 --- a/jni/daemon/bootstages.c +++ b/jni/daemon/bootstages.c @@ -581,6 +581,8 @@ void post_fs_data(int client) { bin_path = "/cache/data_bin"; else if (access("/data/data/com.topjohnwu.magisk/install", F_OK) == 0) bin_path = "/data/data/com.topjohnwu.magisk/install"; + else if (access("/data/user_de/0/com.topjohnwu.magisk/install", F_OK) == 0) + bin_path = "/data/user_de/0/com.topjohnwu.magisk/install"; if (bin_path) { exec_command_sync("rm", "-rf", DATABIN, NULL); exec_command_sync("cp", "-r", bin_path, DATABIN, NULL); diff --git a/jni/su b/jni/su index c66632227..c912c192e 160000 --- a/jni/su +++ b/jni/su @@ -1 +1 @@ -Subproject commit c66632227b69ed4ded45518852474592a4b3bca8 +Subproject commit c912c192e0d03119a14d7b772caa5d77bc4b7999