From a7a59d21e4613ae2c4550311a43ee037e33e5d4a Mon Sep 17 00:00:00 2001 From: LoveSy Date: Wed, 10 Mar 2021 14:40:13 +0800 Subject: [PATCH] [core] No more live patch (#317) --- build.gradle.kts | 2 +- .../lsposed/lspd/service/ConfigManager.java | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 806f66f4..65f13371 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ val commitCount = Git(repo).log().add(refId).call().count() val defaultManagerPackageName by extra("io.github.lsposed.manager") val verCode by extra(commitCount + 4200) -val verName by extra("v1.3.0") +val verName by extra("v1.3.1") val androidTargetSdkVersion by extra(30) val androidMinSdkVersion by extra(27) val androidBuildToolsVersion by extra("30.0.3") diff --git a/core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java b/core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java index dc59bd4c..cce12ac6 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java +++ b/core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java @@ -58,7 +58,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; import io.github.lsposed.lspd.Application; import io.github.lsposed.lspd.BuildConfig; @@ -164,22 +163,9 @@ public class ConfigManager { } } - private static boolean checkSepolicy() { - return SELinux.checkSELinuxAccess("u:r:system_server:s0", "u:r:system_server:s0", "process", "execmem"); - } - // for system server, cache is not yet ready, we need to query database for it public boolean shouldSkipSystemServer() { - if (!checkSepolicy()) { - Log.d(TAG, "sepolicy is not loaded, trying livepatch"); - try { - Process p = Runtime.getRuntime().exec(new String[]{"supolicy", "--live", - "allow system_server system_server process execmem"}); - p.waitFor(5, TimeUnit.SECONDS); - } catch (Throwable ignored) { - } - } - if (!checkSepolicy()) { + if (!SELinux.checkSELinuxAccess("u:r:system_server:s0", "u:r:system_server:s0", "process", "execmem")) { sepolicyLoaded = false; Log.e(TAG, "skip injecting into android because sepolicy was not loaded properly"); return true; // skip