WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[core] Remove old code (#1274)

This commit is contained in:
南宫雪珊 2021-10-14 23:06:19 +08:00 committed by GitHub
parent 6693631485
commit 5800eda575
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
core/src/main/java/org/lsposed/lspd/service/ConfigFileManager.java
View File

@ -8,7 +8,6 @@ import android.content.res.Resources;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.SELinux; import android.os.SELinux;
import android.os.SharedMemory; import android.os.SharedMemory;
import android.os.SystemProperties;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.OsConstants; import android.system.OsConstants;
import android.util.Log; import android.util.Log;
@ -42,7 +41,6 @@ import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
@ -77,43 +75,6 @@ public class ConfigFileManager {
return res; return res;
} }
// from AndroidRuntime.cpp
private static String readLocale() {
String locale = SystemProperties.get("persist.sys.locale", "");
if (!locale.isEmpty()) {
return locale;
}
String language = SystemProperties.get("persist.sys.language", "");
if (!language.isEmpty()) {
String country = SystemProperties.get("persist.sys.country", "");
String variant = SystemProperties.get("persist.sys.localevar", "");
String out = language;
if (!country.isEmpty()) {
out = out + "-" + country;
}
if (!variant.isEmpty()) {
out = out + "-" + variant;
}
return out;
}
String productLocale = SystemProperties.get("ro.product.locale", "");
if (!productLocale.isEmpty()) {
return productLocale;
}
// If persist.sys.locale and ro.product.locale are missing,
// construct a locale value from the individual locale components.
String productLanguage = SystemProperties.get("ro.product.locale.language", "en");
String productRegion = SystemProperties.get("ro.product.locale.region", "US");
return productLanguage + "-" + productRegion;
}
private static void loadRes() { private static void loadRes() {
if (res != null) return; if (res != null) return;
try { try {
@ -278,41 +239,6 @@ public class ConfigFileManager {
return file; return file;
} }
private static String readText(Path file) throws IOException {
return new String(Files.readAllBytes(file)).trim();
}
// TODO: Remove after next release
static void migrateOldConfig(ConfigManager configManager) {
var miscPath = basePath.resolve("misc_path");
var enableResources = configDirPath.resolve("enable_resources");
var manager = configDirPath.resolve("manager");
var verboseLog = configDirPath.resolve("verbose_log");
if (Files.exists(miscPath)) {
try {
var s = "/data/misc/" + readText(miscPath);
configManager.updateModulePrefs("lspd", 0, "config", "misc_path", s);
Files.delete(miscPath);
} catch (IOException ignored) {
}
}
if (Files.exists(enableResources)) {
try {
var s = readText(enableResources);
var i = Integer.parseInt(s);
configManager.updateModulePrefs("lspd", 0, "config", "enable_resources", i == 1);
Files.delete(enableResources);
} catch (IOException ignored) {
}
}
try {
Files.deleteIfExists(manager);
Files.deleteIfExists(verboseLog);
} catch (IOException ignored) {
}
}
static boolean tryLock() { static boolean tryLock() {
var openOptions = new HashSet<OpenOption>(); var openOptions = new HashSet<OpenOption>();
openOptions.add(StandardOpenOption.CREATE); openOptions.add(StandardOpenOption.CREATE);

1
core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
View File

@ -203,7 +203,6 @@ public class ConfigManager {
} }
private synchronized void updateConfig() { private synchronized void updateConfig() {
ConfigFileManager.migrateOldConfig(this);
Map<String, Object> config = getModulePrefs("lspd", 0, "config"); Map<String, Object> config = getModulePrefs("lspd", 0, "config");
Object bool = config.get("enable_resources"); Object bool = config.get("enable_resources");