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

[core] Fix NPE (#967)

This commit is contained in:
vvb2060 2021-08-21 15:36:06 +08:00 committed by GitHub
parent c87172e88c
commit 4e61b4d2ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -905,6 +905,7 @@ public class ConfigManager {
public ParcelFileDescriptor getVerboseLog() {
try {
var logcat = ServiceManager.getLogcatService().getLog();
if (logcat == null) return null;
return ParcelFileDescriptor.open(logcat, ParcelFileDescriptor.MODE_READ_ONLY);
} catch (FileNotFoundException e) {
Log.e(TAG, Log.getStackTraceString(e));
@ -915,6 +916,7 @@ public class ConfigManager {
public boolean clearLogs(boolean verbose) {
try {
var logcat = ServiceManager.getLogcatService().getLog();
if (verbose && logcat == null) return true;
OutputStream os = new FileOutputStream(verbose ? logcat : modulesLog);
os.close();
return true;

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

@ -4,18 +4,20 @@ import android.os.ParcelFileDescriptor;
import android.os.SystemProperties;
import android.util.Log;
import androidx.annotation.Nullable;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
public class LogcatService implements Runnable {
private static final String TAG = "LSPosedLogcat";
private Thread thread;
private final File logPath;
private final DateTimeFormatter logTimeFormat;
private File log = null;
private static DateTimeFormatter logTimeFormat;
private Thread thread = null;
public LogcatService(File logPath) {
System.loadLibrary("daemon");
@ -39,9 +41,9 @@ public class LogcatService implements Runnable {
var mode = ParcelFileDescriptor.MODE_WRITE_ONLY | ParcelFileDescriptor.MODE_CREATE |
ParcelFileDescriptor.MODE_TRUNCATE | ParcelFileDescriptor.MODE_APPEND;
try {
return ParcelFileDescriptor.open(log, mode).detachFd();
} catch (FileNotFoundException e) {
try (var fd = ParcelFileDescriptor.open(log, mode)) {
return fd.detachFd();
} catch (IOException e) {
Log.w(TAG, "someone chattr +i ?", e);
return -1;
}
@ -67,6 +69,7 @@ public class LogcatService implements Runnable {
return thread != null && thread.isAlive();
}
@Nullable
public File getLog() {
return log;
}