Only reset NB prop when zygisk is enabled

This commit is contained in:
Wang Han
2025-10-01 14:46:48 +08:00
committed by John Wu
parent 8836a09c8c
commit d60806f429
2 changed files with 8 additions and 4 deletions

View File

@@ -16,7 +16,7 @@ use nix::fcntl::OFlag;
use std::io::BufReader;
use std::os::unix::net::UnixStream;
use std::process::{Command, Stdio};
use std::sync::atomic::Ordering;
use std::sync::atomic::{AtomicBool, Ordering};
bitflags! {
#[derive(Default)]
@@ -185,7 +185,9 @@ impl MagiskD {
setup_preinit_dir();
self.ensure_manager();
self.zygisk.lock().unwrap().reset(true);
if self.zygisk_enabled.load(Ordering::Relaxed) {
self.zygisk.lock().unwrap().reset(true);
}
}
pub fn boot_stage_handler(&self, client: UnixStream, code: RequestCode) {

View File

@@ -33,7 +33,7 @@ use std::io::{BufReader, Write};
use std::os::fd::{AsFd, AsRawFd, IntoRawFd, RawFd};
use std::os::unix::net::{UCred, UnixListener, UnixStream};
use std::process::{Command, exit};
use std::sync::atomic::AtomicBool;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Mutex, OnceLock};
use std::time::Duration;
@@ -130,7 +130,9 @@ impl MagiskD {
info!("** zygote restarted");
self.prune_su_access();
scan_deny_apps();
self.zygisk.lock().unwrap().reset(false);
if self.zygisk_enabled.load(Ordering::Relaxed) {
self.zygisk.lock().unwrap().reset(false);
}
}
RequestCode::SQLITE_CMD => {
self.db_exec_for_cli(client).ok();