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
7504675f
Commit
7504675f
authored
8 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Fix crash on startup when abi mismatch
parent
47f59fba
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
vlc-android/src/org/videolan/vlc/VLCApplication.java
+2
-0
2 additions, 0 deletions
vlc-android/src/org/videolan/vlc/VLCApplication.java
vlc-android/src/org/videolan/vlc/util/VLCInstance.java
+5
-2
5 additions, 2 deletions
vlc-android/src/org/videolan/vlc/util/VLCInstance.java
with
7 additions
and
2 deletions
vlc-android/src/org/videolan/vlc/VLCApplication.java
+
2
−
0
View file @
7504675f
...
...
@@ -119,6 +119,8 @@ public class VLCApplication extends Application {
sTV
=
AndroidDevices
.
isAndroidTv
()
||
!
AndroidDevices
.
hasTsp
();
if
(!
VLCInstance
.
testCompatibleCPU
(
this
))
return
;
Dialog
.
setCallbacks
(
VLCInstance
.
get
(),
mDialogCallbacks
);
// Disable remote control receiver on Fire TV.
...
...
This diff is collapsed.
Click to expand it.
vlc-android/src/org/videolan/vlc/util/VLCInstance.java
+
5
−
2
View file @
7504675f
...
...
@@ -20,6 +20,7 @@
package
org.videolan.vlc.util
;
import
android.app.Activity
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.res.AssetManager
;
...
...
@@ -136,8 +137,10 @@ public class VLCInstance {
public
static
synchronized
boolean
testCompatibleCPU
(
Context
context
)
{
if
(
sLibVLC
==
null
&&
!
VLCUtil
.
hasCompatibleCPU
(
context
))
{
final
Intent
i
=
new
Intent
(
context
,
CompatErrorActivity
.
class
);
context
.
startActivity
(
i
);
if
(
context
instanceof
Activity
)
{
final
Intent
i
=
new
Intent
(
context
,
CompatErrorActivity
.
class
);
context
.
startActivity
(
i
);
}
return
false
;
}
else
return
true
;
...
...
This diff is collapsed.
Click to expand it.
Geoffrey Métais
@Dekans
mentioned in commit
00913fba
·
8 years ago
mentioned in commit
00913fba
mentioned in commit 00913fbad990f3ff4ac99ab9f10f97623b68623b
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