Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-29 22:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Skip stub APK install on emulator

Browse Source 
Reduce test flakiness
This commit is contained in:
topjohnwu 2025-03-26 12:40:57 -07:00 committed by John Wu
parent e66fe8533e
commit 2aba7247a9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
native/src/core/package.rs
View File

@ -1,11 +1,11 @@
use crate::consts::{APP_PACKAGE_NAME, MAGISK_VER_CODE};
use crate::daemon::{to_app_id, MagiskD, AID_APP_END, AID_APP_START, AID_USER_OFFSET};
use crate::ffi::{get_magisk_tmp, install_apk, uninstall_pkg, DbEntryKey};
use base::libc::{O_CLOEXEC, O_CREAT, O_RDONLY, O_TRUNC, O_WRONLY};
use crate::daemon::{AID_APP_END, AID_APP_START, AID_USER_OFFSET, MagiskD, to_app_id};
use crate::ffi::{DbEntryKey, get_magisk_tmp, install_apk, uninstall_pkg};
use base::WalkResult::{Abort, Continue, Skip};
use base::libc::{O_CLOEXEC, O_CREAT, O_RDONLY, O_TRUNC, O_WRONLY};
use base::{
cstr, cstr_buf, error, fd_get_attr, open_fd, warn, BufReadExt, Directory, FsPath, FsPathBuf,
LoggedResult, ReadExt, ResultExt, Utf8CStrBuf,
BufReadExt, Directory, FsPath, FsPathBuf, LoggedResult, ReadExt, ResultExt, Utf8CStrBuf, cstr,
cstr_buf, error, fd_get_attr, open_fd, warn,
};
use bit_set::BitSet;
use cxx::CxxString;
@ -357,7 +357,7 @@ impl ManagerInfo {
{
// no APK
if file.path == Path::new("/data/system/packages.xml") {
if install {
if install && !daemon.is_emulator {
self.install_stub();
}
return (-1, "");
@ -402,7 +402,7 @@ impl ManagerInfo {
)
} else {
(-1, "")
}
};
}
Status::NotInstalled => {
daemon.rm_db_string(DbEntryKey::SuManager).ok();
@ -434,7 +434,7 @@ impl ManagerInfo {
self.tracked_files
.insert(user, TrackedFile::new("/data/system/packages.xml"));
if install {
if install && !daemon.is_emulator {
self.install_stub();
}
(-1, "")