andreacavalli
/
Magisk
forked from MarcoBuster/Magisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use daemon state to determine late prop hiding

This commit is contained in:
topjohnwu 2020-05-18 05:21:47 -07:00
parent 501d3e6c32
commit c3e045e367
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/core/bootstages.cpp
View File

@ -19,7 +19,7 @@
using namespace std;
bool pfs_done = false;
static bool pfs_done = false;
static bool no_secure_dir = false;
static bool safe_mode = false;

8
native/jni/core/daemon.cpp
View File

@ -20,7 +20,7 @@ using namespace std;
int SDK_INT = -1;
bool RECOVERY_MODE = false;
string MAGISKTMP;
int daemon_state = STATE_UNKNOWN;
int DAEMON_STATE = STATE_UNKNOWN;
static struct stat self_st;
@ -98,13 +98,13 @@ static void handle_request(int client) {
switch (req_code) {
// In case of init trigger launches, set the corresponding states
case POST_FS_DATA:
daemon_state = STATE_POST_FS_DATA;
DAEMON_STATE = STATE_POST_FS_DATA;
break;
case LATE_START:
daemon_state = STATE_LATE_START;
DAEMON_STATE = STATE_LATE_START;
break;
case BOOT_COMPLETE:
daemon_state = STATE_BOOT_COMPLETE;
DAEMON_STATE = STATE_BOOT_COMPLETE;
break;
// Simple requests to query daemon info

6
native/jni/include/daemon.hpp
View File

@ -39,11 +39,11 @@ enum {
extern int SDK_INT;
extern bool RECOVERY_MODE;
extern int daemon_state;
extern bool pfs_done;
extern std::vector<std::string> module_list;
extern int DAEMON_STATE;
#define APP_DATA_DIR (SDK_INT >= 24 ? "/data/user_de" : "/data/user")
extern std::vector<std::string> module_list;
// Daemon handlers
void post_fs_data(int client);
void late_start(int client);

2
native/jni/magiskhide/hide_utils.cpp
View File

@ -247,7 +247,7 @@ int launch_magiskhide() {
return DAEMON_ERROR;
hide_sensitive_props();
if (pfs_done)
if (DAEMON_STATE >= STATE_BOOT_COMPLETE)
hide_late_sensitive_props();
// Initialize the mutex lock