Browse Source

Enable debug logs for debug builds

merge-requests/1535/head
Nicolas Pomepuy 4 years ago
parent
commit
0d93c33a0c
  1. 14
      application/app/flavors/release/AndroidManifest.xml
  2. 6
      application/vlc-android/AndroidManifest.xml
  3. 2
      application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.kt

14
application/app/flavors/release/AndroidManifest.xml

@ -24,12 +24,8 @@
~
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.READ_LOGS" tools:node="remove" />
<!-- Extensions API permissions -->
<permission
android:name="org.videolan.vlc.permission.READ_EXTENSION_DATA"
android:protectionLevel="normal" />
@ -41,12 +37,6 @@
<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="${applicationId}.gui.DebugLogActivity"
android:theme="@style/Theme.VLC"
android:launchMode="singleTop" />
<service android:name="${applicationId}.DebugLogService"
android:process=":logger" />
</application>
<application/>
</manifest>

6
application/vlc-android/AndroidManifest.xml

@ -682,6 +682,12 @@
android:name="android.media.tv.input"
android:resource="@xml/previewinputservice"/>
</service>
<activity android:name=".gui.DebugLogActivity"
android:theme="@style/Theme.VLC"
android:launchMode="singleTop" />
<service android:name=".DebugLogService"
android:process=":logger" />
</application>
</manifest>

2
application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.kt

@ -48,7 +48,6 @@ import org.videolan.resources.*
import org.videolan.tools.BitmapCache
import org.videolan.tools.Settings
import org.videolan.tools.putSingle
import org.videolan.vlc.BuildConfig
import org.videolan.vlc.R
import org.videolan.vlc.gui.DebugLogActivity
import org.videolan.vlc.gui.dialogs.ConfirmDeleteDialog
@ -72,7 +71,6 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
if (BuildConfig.DEBUG) findPreference<Preference>("debug_logs")?.isVisible = false
if (FeatureFlag.values().isNotEmpty()) findPreference<Preference>("optional_features")?.isVisible = true
findPreference<EditTextPreference>("network_caching")?.setOnBindEditTextListener {

Loading…
Cancel
Save