Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
529
Issue boards
Milestones
Wiki
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
584d29b1
Commit
584d29b1
authored
7 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Fix deadlock at app startup
parent
8fcd6587
No related branches found
Branches containing commit
Tags
3.0.0-rc4
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
medialibrary/src/org/videolan/medialibrary/Medialibrary.java
+2
-8
2 additions, 8 deletions
medialibrary/src/org/videolan/medialibrary/Medialibrary.java
vlc-android/src/org/videolan/vlc/VLCApplication.java
+6
-1
6 additions, 1 deletion
vlc-android/src/org/videolan/vlc/VLCApplication.java
with
8 additions
and
9 deletions
medialibrary/src/org/videolan/medialibrary/Medialibrary.java
+
2
−
8
View file @
584d29b1
...
...
@@ -67,13 +67,7 @@ public class Medialibrary {
private
final
List
<
EntryPointsEventsCb
>
entryPointsEventsCbList
=
new
ArrayList
<>();
private
static
Context
sContext
;
static
{
LibVLC
.
loadLibraries
();
}
private
static
class
MedialibraryHolder
{
public
static
final
Medialibrary
instance
=
new
Medialibrary
();
}
private
static
final
Medialibrary
instance
=
new
Medialibrary
();
public
static
Context
getContext
()
{
return
sContext
;
...
...
@@ -143,7 +137,7 @@ public class Medialibrary {
}
public
static
Medialibrary
getInstance
()
{
return
MedialibraryHolder
.
instance
;
return
instance
;
}
@WorkerThread
...
...
This diff is collapsed.
Click to expand it.
vlc-android/src/org/videolan/vlc/VLCApplication.java
+
6
−
1
View file @
584d29b1
...
...
@@ -36,6 +36,7 @@ import android.support.v4.util.SimpleArrayMap;
import
android.util.Log
;
import
org.videolan.libvlc.Dialog
;
import
org.videolan.libvlc.LibVLC
;
import
org.videolan.libvlc.util.AndroidUtil
;
import
org.videolan.medialibrary.Medialibrary
;
import
org.videolan.vlc.gui.DialogActivity
;
...
...
@@ -74,7 +75,7 @@ public class VLCApplication extends Application {
public
static
final
ThreadFactory
THREAD_FACTORY
=
new
ThreadFactory
()
{
@Override
public
Thread
newThread
(
Runnable
runnable
)
{
Thread
thread
=
new
Thread
(
runnable
);
final
Thread
thread
=
new
Thread
(
runnable
);
thread
.
setPriority
(
Process
.
THREAD_PRIORITY_DEFAULT
+
Process
.
THREAD_PRIORITY_LESS_FAVORABLE
);
return
thread
;
}
...
...
@@ -93,9 +94,12 @@ public class VLCApplication extends Application {
setLocale
();
LibVLC
.
loadLibraries
();
runBackground
(
new
Runnable
()
{
@Override
public
void
run
()
{
if
(
AndroidUtil
.
isOOrLater
)
NotificationHelper
.
createNotificationChannels
();
// Prepare cache folder constants
...
...
@@ -112,6 +116,7 @@ public class VLCApplication extends Application {
AndroidDevices
.
setRemoteControlReceiverEnabled
(
false
);
}
});
if
(
sActivityCbListener
!=
null
)
registerActivityLifecycleCallbacks
(
sActivityCbListener
);
else
...
...
This diff is collapsed.
Click to expand it.
Geoffrey Métais
@Dekans
mentioned in commit
2162737b
·
7 years ago
mentioned in commit
2162737b
mentioned in commit 2162737bfee5daf34737403b8e41eaabeed6cb56
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment