Skip to content
Snippets Groups Projects
Commit eb1ac628 authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Deactivate DebugLogService in debug builds

This service runs in another process, it prevented the use of Instant
Run during development.
parent 21ecf477
No related branches found
No related tags found
No related merge requests found
......@@ -477,11 +477,6 @@
<activity android:name=".gui.CompatErrorActivity" />
<activity android:name=".gui.preferences.PreferencesActivity"
android:theme="@style/Theme.VLC" />
<activity android:name=".gui.DebugLogActivity"
android:launchMode="singleTop" />
<service android:name=".DebugLogService"
android:process=":logger" />
<activity
android:name=".gui.video.VideoPlayerActivity"
android:resizeableActivity="true"
......
......@@ -18,4 +18,11 @@
<uses-permission android:name="org.videolan.vlc.permission.READ_EXTENSION_DATA" />
<uses-permission android:name="org.videolan.vlc.permission.BIND_DATA_CONSUMER" />
<application>
<activity android:name=".gui.DebugLogActivity"
android:launchMode="singleTop" />
<service android:name=".DebugLogService"
android:process=":logger" />
</application>
</manifest>
......@@ -28,12 +28,11 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.EditTextPreference;
import androidx.preference.Preference;
import android.os.Bundle;
import android.widget.Toast;
import org.videolan.medialibrary.Medialibrary;
import org.videolan.vlc.BuildConfig;
import org.videolan.vlc.R;
import org.videolan.vlc.VLCApplication;
import org.videolan.vlc.gui.DebugLogActivity;
......@@ -46,6 +45,10 @@ import org.videolan.vlc.util.WorkersKt;
import java.io.File;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.EditTextPreference;
import androidx.preference.Preference;
public class PreferencesAdvanced extends BasePreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
@Override
protected int getXml() {
......@@ -58,6 +61,12 @@ public class PreferencesAdvanced extends BasePreferenceFragment implements Share
return R.string.advanced_prefs_category;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (BuildConfig.DEBUG) findPreference("debug_logs").setVisible(false);
}
@Override
public void onStart() {
super.onStart();
......
......@@ -31,15 +31,18 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Build;
import androidx.preference.EditTextPreference;
import androidx.preference.Preference;
import android.os.Bundle;
import android.widget.Toast;
import org.videolan.vlc.BuildConfig;
import org.videolan.vlc.R;
import org.videolan.vlc.VLCApplication;
import org.videolan.vlc.gui.DebugLogActivity;
import org.videolan.vlc.util.VLCInstance;
import androidx.preference.EditTextPreference;
import androidx.preference.Preference;
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
public class PreferencesAdvanced extends BasePreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
@Override
......@@ -53,6 +56,12 @@ public class PreferencesAdvanced extends BasePreferenceFragment implements Share
return R.string.advanced_prefs_category;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (BuildConfig.DEBUG) findPreference("debug_logs").setVisible(false);
}
@Override
public void onStart() {
super.onStart();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment