TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-25 15:17:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid doing any unmounts for SysUI

Browse Source
This commit is contained in:
topjohnwu 2022-08-31 00:15:15 -07:00
parent 1565bf5442
commit 555a54ec53
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/src/zygisk/hook.cpp
View File

@ -154,13 +154,19 @@ DCL_HOOK_FUNC(int, fork) {
// Unmount stuffs in the process's private mount namespace // Unmount stuffs in the process's private mount namespace
DCL_HOOK_FUNC(int, unshare, int flags) { DCL_HOOK_FUNC(int, unshare, int flags) {
int res = old_unshare(flags); int res = old_unshare(flags);
if (g_ctx && (flags & CLONE_NEWNS) != 0 && res == 0) { if (g_ctx && (flags & CLONE_NEWNS) != 0 && res == 0 &&
// For some unknown reason, unmounting app_process in SysUI can break.
// This is reproducible on the official AVD running API 26 and 27.
// Simply avoid doing any unmounts for SysUI to avoid potential issues.
g_ctx->process && g_ctx->process != "com.android.systemui"sv) {
if (g_ctx->state[DO_UNMOUNT]) { if (g_ctx->state[DO_UNMOUNT]) {
revert_unmount(); revert_unmount();
} else { } else {
umount2("/system/bin/app_process64", MNT_DETACH); umount2("/system/bin/app_process64", MNT_DETACH);
umount2("/system/bin/app_process32", MNT_DETACH); umount2("/system/bin/app_process32", MNT_DETACH);
} }
// Restore errno back to 0
errno = 0;
} }
return res; return res;
} }