diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3ffebc8..6d7d1b2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index 165cb44..40edcfb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,8 +7,8 @@ pluginManagement { gradlePluginPortal() } plugins { - id("com.android.library") version "7.4.1" - id("com.android.application") version "7.4.1" + id("com.android.library") version "7.4.2" + id("com.android.application") version "7.4.2" } } diff --git a/zygiskd/src/root_impl/kernelsu.rs b/zygiskd/src/root_impl/kernelsu.rs index cb0d2a2..35a9c03 100644 --- a/zygiskd/src/root_impl/kernelsu.rs +++ b/zygiskd/src/root_impl/kernelsu.rs @@ -24,6 +24,7 @@ pub fn get_kernel_su() -> Option { } } +#[inline(never)] pub fn uid_on_allowlist(uid: i32) -> bool { let mut size = 1024u32; let mut uids = vec![0; size as usize]; @@ -32,6 +33,7 @@ pub fn uid_on_allowlist(uid: i32) -> bool { uids.contains(&uid) } +#[inline(never)] pub fn uid_on_denylist(uid: i32) -> bool { let mut size = 1024u32; let mut uids = vec![0; size as usize]; diff --git a/zygiskd/src/root_impl/magisk.rs b/zygiskd/src/root_impl/magisk.rs index 7d51f77..d82efe8 100644 --- a/zygiskd/src/root_impl/magisk.rs +++ b/zygiskd/src/root_impl/magisk.rs @@ -23,6 +23,7 @@ pub fn get_magisk() -> Option { }) } +#[inline(never)] pub fn uid_on_allowlist(uid: i32) -> bool { let output: Option = Command::new("magisk") .arg("--sqlite") @@ -40,6 +41,7 @@ pub fn uid_on_allowlist(uid: i32) -> bool { }) } +#[inline(never)] pub fn uid_on_denylist(uid: i32) -> bool { // TODO: uid_on_denylist return false; diff --git a/zygiskd/src/zygiskd.rs b/zygiskd/src/zygiskd.rs index 6611613..7c12a35 100644 --- a/zygiskd/src/zygiskd.rs +++ b/zygiskd/src/zygiskd.rs @@ -198,7 +198,7 @@ fn handle_daemon_action(mut stream: UnixStream, context: &Context) -> Result<()> match root_impl::get_impl() { root_impl::RootImpl::KernelSU => flags |= constants::PROCESS_ROOT_IS_KSU, root_impl::RootImpl::Magisk => flags |= constants::PROCESS_ROOT_IS_MAGISK, - _ => () + _ => unreachable!(), } // TODO: PROCESS_IS_SYSUI? stream.write_u32(flags)?;