TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-15 11:20:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Drop API 17 (Android 4.2) support"

Browse Source 
Turns out that we cannot use AndroidKeystore anyways, so we don't
actually need to drop API 17. Revert this change.
This commit is contained in:
topjohnwu
2019-10-20 07:13:03 -04:00
parent 325d9a0b86
commit 75306f658f
6 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
native/jni/init/rootdir.cpp
View File

@@ -153,24 +153,25 @@ void SARCompatInit::setup_rootfs() {
}
bool MagiskInit::patch_sepolicy(const char *file) {
bool require_patch = false;
// Mount selinuxfs to communicate with kernel
xmount("selinuxfs", SELINUX_MNT, "selinuxfs", 0, nullptr);
bool patch_init = false;
if (access(SPLIT_PLAT_CIL, R_OK) == 0) {
LOGD("sepol: split policy\n");
load_split_cil();
require_patch = true;
patch_init = true;
} else if (access("/sepolicy", R_OK) == 0) {
LOGD("sepol: monolithic policy\n");
load_policydb("/sepolicy");
} else {
// Fatal error!!
LOGD("sepol: no selinux\n");
return false;
}
// Mount selinuxfs to communicate with kernel
xmount("selinuxfs", SELINUX_MNT, "selinuxfs", 0, nullptr);
if (patch_init)
load_split_cil();
sepol_magisk_rules();
sepol_allow(SEPOL_PROC_DOMAIN, ALL, ALL, ALL);
dump_policydb(file);
@@ -181,7 +182,7 @@ bool MagiskInit::patch_sepolicy(const char *file) {
link("/sepolicy", "/sepolicy_debug");
}
return require_patch;
return patch_init;
}
constexpr const char wrapper[] =