From fce5e8360987439856792a677bf04e93996463f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=97=E5=AE=AB=E9=9B=AA=E7=8F=8A?= Date: Fri, 1 Oct 2021 13:53:03 +0800 Subject: [PATCH] [core] Enable verbose log on debug build (#1203) --- .../org/lsposed/manager/ui/fragment/SettingsFragment.java | 3 ++- .../main/java/org/lsposed/lspd/service/ConfigManager.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java index d1866b76..0ef7b3af 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java @@ -44,6 +44,7 @@ import com.google.android.material.snackbar.Snackbar; import com.takisoft.preferencex.PreferenceFragmentCompat; import org.lsposed.manager.App; +import org.lsposed.manager.BuildConfig; import org.lsposed.manager.ConfigManager; import org.lsposed.manager.R; import org.lsposed.manager.databinding.FragmentSettingsBinding; @@ -145,7 +146,7 @@ public class SettingsFragment extends BaseFragment { boolean installed = ConfigManager.isBinderAlive(); SwitchPreference prefVerboseLogs = findPreference("disable_verbose_log"); if (prefVerboseLogs != null) { - prefVerboseLogs.setEnabled(installed); + prefVerboseLogs.setEnabled(!BuildConfig.DEBUG && installed); prefVerboseLogs.setChecked(!installed || !ConfigManager.isVerboseLogEnabled()); prefVerboseLogs.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setVerboseLogEnabled(!(boolean) newValue)); diff --git a/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java index d66f6ae6..9980b109 100644 --- a/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java +++ b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java @@ -231,7 +231,7 @@ public class ConfigManager { } public synchronized void updateManager(boolean uninstalled) { - if (uninstalled){ + if (uninstalled) { managerUid = -1; return; } @@ -770,6 +770,7 @@ public class ConfigManager { } public void setVerboseLog(boolean on) { + if (BuildConfig.DEBUG) return; var logcatService = ServiceManager.getLogcatService(); if (on) { logcatService.startVerbose(); @@ -785,7 +786,7 @@ public class ConfigManager { } public boolean verboseLog() { - return verboseLog; + return BuildConfig.DEBUG || verboseLog; } public ParcelFileDescriptor getManagerApk() {