MarcoBuster/Magisk
1
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Preserve at least 32M free size

Browse Source
This commit is contained in:
topjohnwu 2017-05-26 22:05:04 +08:00
parent aa92e4cbd0
commit f872a122a9
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jni/daemon/bootstages.c
View File

@ -110,7 +110,7 @@ static int get_img_size(const char *img, int *used, int *total) {
return 0; return 0;
} }
#define round_size(a) ((((a) / 32) + 1) * 32) #define round_size(a) ((((a) / 32) + 2) * 32)
static int resize_img(const char *img, int size) { static int resize_img(const char *img, int size) {
LOGI("resize %s to %dM\n", img, size); LOGI("resize %s to %dM\n", img, size);
@ -179,7 +179,7 @@ static void trim_img(const char *img) {
int used, total, new_size; int used, total, new_size;
get_img_size(img, &used, &total); get_img_size(img, &used, &total);
new_size = round_size(used); new_size = round_size(used);
if (new_size < total) if (new_size != total)
resize_img(img, new_size); resize_img(img, new_size);
} }
@ -694,7 +694,7 @@ void post_fs_data(int client) {
} }
// Start magiskhide if enabled // Start magiskhide if enabled
char *hide_prop = getprop("persist.magisk.hide"); char *hide_prop = getprop(MAGISKHIDE_PROP);
if (hide_prop) { if (hide_prop) {
if (strcmp(hide_prop, "1") == 0) { if (strcmp(hide_prop, "1") == 0) {
pthread_t thread; pthread_t thread;

2
jni/magisk.h
View File

@ -45,6 +45,8 @@
#define SELINUX_POLICY SELINUX_PATH "policy" #define SELINUX_POLICY SELINUX_PATH "policy"
#define SELINUX_LOAD SELINUX_PATH "load" #define SELINUX_LOAD SELINUX_PATH "load"
#define MAGISKHIDE_PROP "persist.magisk.hide"
// Global handler for PLOGE // Global handler for PLOGE
extern __thread void (*err_handler)(void); extern __thread void (*err_handler)(void);

4
jni/magiskhide/magiskhide.c
View File

@ -56,7 +56,7 @@ void launch_magiskhide(int client) {
hideEnabled = 1; hideEnabled = 1;
if (client != -1) { if (client != -1) {
if (setprop("persist.magisk.hide", "1")) if (setprop(MAGISKHIDE_PROP, "1"))
goto error; goto error;
} }
@ -120,7 +120,7 @@ void stop_magiskhide(int client) {
LOGI("* Stopping MagiskHide\n"); LOGI("* Stopping MagiskHide\n");
hideEnabled = 0; hideEnabled = 0;
setprop("persist.magisk.hide", "0"); setprop(MAGISKHIDE_PROP, "0");
pthread_kill(proc_monitor_thread, SIGUSR1); pthread_kill(proc_monitor_thread, SIGUSR1);
write_int(client, DAEMON_SUCCESS); write_int(client, DAEMON_SUCCESS);