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

[core] Don't override system properties (#972)

This commit is contained in:
vvb2060 2021-08-21 20:58:42 +08:00 committed by GitHub
parent e72bd46705
commit 3600e53865
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/magisk_module/lspd
View File

@ -6,15 +6,15 @@ debug="false"
if [ -r $tmpLspdDex ]; then if [ -r $tmpLspdDex ]; then
java_options="-Djava.class.path=$tmpLspdDex" java_options="-Djava.class.path=$tmpLspdDex"
java_options="$java_options -Djava.library.path=/data/local/tmp" java_options="$java_options -Dlsp.library.path=/data/local/tmp"
debug="true" debug="true"
elif [ -d "$dir/system" ]; then elif [ -d "$dir/system" ]; then
java_options="-Djava.class.path=$dir/system/framework/lspd.dex" java_options="-Djava.class.path=$dir/system/framework/lspd.dex"
java_options="$java_options -Djava.library.path=$dir" java_options="$java_options -Dlsp.library.path=$dir"
debug="true" debug="true"
else else
java_options="-Djava.class.path=$dir/framework/lspd.dex" java_options="-Djava.class.path=$dir/framework/lspd.dex"
java_options="$java_options -Djava.library.path=$dir" java_options="$java_options -Dlsp.library.path=$dir"
fi fi
if [ $debug = "true" ]; then if [ $debug = "true" ]; then

5
core/src/main/java/org/lsposed/lspd/service/LogcatService.java
View File

@ -1,5 +1,6 @@
package org.lsposed.lspd.service; package org.lsposed.lspd.service;
import android.annotation.SuppressLint;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.util.Log; import android.util.Log;
@ -19,8 +20,10 @@ public class LogcatService implements Runnable {
private File log = null; private File log = null;
private Thread thread = null; private Thread thread = null;
@SuppressLint("UnsafeDynamicallyLoadedCode")
public LogcatService(File logPath) { public LogcatService(File logPath) {
System.loadLibrary("daemon"); String libraryPath = System.getProperty("lsp.library.path");
System.load(libraryPath + "/" + System.mapLibraryName("daemon"));
this.logPath = logPath; this.logPath = logPath;
logTimeFormat = DateTimeFormatter.ISO_LOCAL_DATE_TIME.withZone(Utils.getZoneId()); logTimeFormat = DateTimeFormatter.ISO_LOCAL_DATE_TIME.withZone(Utils.getZoneId());
} }