TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-15 23:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Monitor /data/system/packages.xml

Browse Source 
Reinstalling system apps as data creates tons of issues.
Calling pm path <pkg> is extremely expensive and doesn't work in post-fs-data.
Parse through packages.xml to get APK path and UID at the same time.
As a bonus, we don't need to traverse /data/app for packages anymore.
This commit is contained in:
topjohnwu
2019-02-18 03:05:13 -05:00
parent 14aa6041ec
commit 692f893e1f
5 changed files with 78 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ using namespace std;
// Protect access to both hide_list and hide_uid
pthread_mutex_t list_lock;
vector<string> hide_list;
set<int> hide_uid;
// Treat GMS separately as we're only interested in one component
int gms_uid = -1;
@@ -60,21 +59,6 @@ static void hide_sensitive_props() {
}
}
/*
* Bionic's atoi runs through strtol().
* Use our own implementation for faster conversion.
*/
static inline int parse_int(const char *s) {
int val = 0;
char c;
while ((c = *(s++))) {
if (c > '9' || c < '0')
return -1;
val = val * 10 + c - '0';
}
return val;
}
// Leave /proc fd opened as we're going to read from it repeatedly
static DIR *procfp;
void crawl_procfs(const function<bool (int)> &fn) {
@@ -148,22 +132,12 @@ static void kill_process(int uid) {
});
}
static int add_pkg_uid(const char *pkg) {
static int get_pkg_uid(const char *pkg) {
char path[4096];
struct stat st;
const char *data = SDK_INT >= 24 ? "/data/user_de/0" : "/data/data";
sprintf(path, "%s/%s", data, pkg);
if (stat(path, &st) == 0) {
hide_uid.insert(st.st_uid);
return st.st_uid;
}
return -1;
}
void refresh_uid() {
hide_uid.clear();
for (auto &s : hide_list)
add_pkg_uid(s.c_str());
return stat(path, &st) ? -1 : st.st_uid;
}
void clean_magisk_props() {
@@ -192,7 +166,7 @@ int add_list(const char *pkg) {
{
MutexGuard lock(list_lock);
hide_list.emplace_back(pkg);
uid = add_pkg_uid(pkg);
uid = get_pkg_uid(pkg);
}
kill_process(uid);
@@ -235,17 +209,17 @@ int rm_list(int client) {
int ret = rm_list(pkg);
free(pkg);
if (ret == DAEMON_SUCCESS)
update_inotify_mask(true);
update_inotify_mask();
return ret;
}
static int init_list(void *, int, char **data, char**) {
LOGI("hide_list init: [%s]\n", *data);
hide_list.emplace_back(*data);
kill_process(*data);
int uid = add_pkg_uid(*data);
int uid = get_pkg_uid(*data);
if (strcmp(*data, SAFETYNET_PKG) == 0)
gms_uid = uid;
kill_process(uid);
return 0;
}