br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Auto reinstall system apps on hide list

Browse Source 
Since we are parsing through /data/app/ to find target APKs for
monitoring, system apps will not be covered in this case.
Automatically reinstall system apps as if they received an update
and refresh the monitor target after it's done.

As a bonus, use RAII idioms for locking pthread_mutex_t.
This commit is contained in:
topjohnwu
2019-02-16 02:24:35 -05:00
parent 19ee189468
commit f4f2274c60
6 changed files with 123 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/jni/magiskhide/hide_utils.cpp
+25 -26
View File
@@ -188,10 +188,12 @@ int add_list(const char *pkg) {
LOGI("hide_list add: [%s]\n", pkg);
// Critical region
pthread_mutex_lock(&list_lock);
hide_list.emplace_back(pkg);
int uid = add_pkg_uid(pkg);
pthread_mutex_unlock(&list_lock);
int uid;
{
MutexGuard lock(list_lock);
hide_list.emplace_back(pkg);
uid = add_pkg_uid(pkg);
}
kill_process(uid);
return DAEMON_SUCCESS;
@@ -207,36 +209,33 @@ int add_list(int client) {
static int rm_list(const char *pkg) {
// Critical region
bool remove = false;
pthread_mutex_lock(&list_lock);
for (auto it = hide_list.begin(); it != hide_list.end(); ++it) {
if (*it == pkg) {
remove = true;
LOGI("hide_list rm: [%s]\n", pkg);
hide_list.erase(it);
break;
{
MutexGuard lock(list_lock);
bool remove = false;
for (auto it = hide_list.begin(); it != hide_list.end(); ++it) {
if (*it == pkg) {
remove = true;
LOGI("hide_list rm: [%s]\n", pkg);
hide_list.erase(it);
break;
}
}
if (!remove)
return HIDE_ITEM_NOT_EXIST;
}
if (remove)
refresh_uid();
pthread_mutex_unlock(&list_lock);
if (remove) {
char sql[4096];
snprintf(sql, sizeof(sql), "DELETE FROM hidelist WHERE process='%s'", pkg);
char *err = db_exec(sql);
db_err(err);
return DAEMON_SUCCESS;
} else {
return HIDE_ITEM_NOT_EXIST;
}
char sql[4096];
snprintf(sql, sizeof(sql), "DELETE FROM hidelist WHERE process='%s'", pkg);
char *err = db_exec(sql);
db_err(err);
return DAEMON_SUCCESS;
}
int rm_list(int client) {
char *pkg = read_string(client);
int ret = rm_list(pkg);
free(pkg);
update_inotify_mask();
if (ret == DAEMON_SUCCESS)
update_inotify_mask(true);
return ret;
}