Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Monado
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
44
Issues
44
List
Boards
Labels
Service Desk
Milestones
Merge Requests
10
Merge Requests
10
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Monado
Monado
Commits
26cd22b2
Commit
26cd22b2
authored
Oct 28, 2020
by
Ryan Pavlik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
a/android: Move class name to a constant.
parent
da3959e6
Pipeline
#220091
passed with stages
in 5 minutes and 21 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
src/xrt/auxiliary/android/android_custom_surface.cpp
src/xrt/auxiliary/android/android_custom_surface.cpp
+7
-7
No files found.
src/xrt/auxiliary/android/android_custom_surface.cpp
View file @
26cd22b2
...
@@ -33,6 +33,9 @@ struct android_custom_surface
...
@@ -33,6 +33,9 @@ struct android_custom_surface
jni
::
method_t
waitGetSurfaceHolderMethod
;
jni
::
method_t
waitGetSurfaceHolderMethod
;
};
};
constexpr
auto
FULLY_QUALIFIED_CLASSNAME
=
"org.freedesktop.monado.auxiliary.MonadoView"
;
struct
android_custom_surface
*
struct
android_custom_surface
*
android_custom_surface_async_start
(
struct
_JavaVM
*
vm
,
void
*
activity
)
android_custom_surface_async_start
(
struct
_JavaVM
*
vm
,
void
*
activity
)
{
{
...
@@ -51,14 +54,12 @@ android_custom_surface_async_start(struct _JavaVM *vm, void *activity)
...
@@ -51,14 +54,12 @@ android_custom_surface_async_start(struct _JavaVM *vm, void *activity)
return
nullptr
;
return
nullptr
;
}
}
auto
clazz
=
loadClassFromPackage
(
auto
clazz
=
loadClassFromPackage
(
info
,
(
jobject
)
activity
,
info
,
(
jobject
)
activity
,
FULLY_QUALIFIED_CLASSNAME
);
"org.freedesktop.monado.auxiliary.MonadoView"
);
if
(
clazz
.
isNull
())
{
if
(
clazz
.
isNull
())
{
U_LOG_E
(
"Could not load class '%s' from package '%s'"
,
U_LOG_E
(
"Could not load class '%s' from package '%s'"
,
"org.freedesktop.monado.auxiliary.MonadoView"
,
FULLY_QUALIFIED_CLASSNAME
,
XRT_ANDROID_PACKAGE
);
XRT_ANDROID_PACKAGE
);
return
nullptr
;
return
nullptr
;
}
}
...
@@ -73,8 +74,7 @@ android_custom_surface_async_start(struct _JavaVM *vm, void *activity)
...
@@ -73,8 +74,7 @@ android_custom_surface_async_start(struct _JavaVM *vm, void *activity)
}
}
std
::
string
clazz_name
=
ret
->
monadoViewClass
.
getName
();
std
::
string
clazz_name
=
ret
->
monadoViewClass
.
getName
();
if
(
clazz_name
!=
if
(
clazz_name
!=
FULLY_QUALIFIED_CLASSNAME
)
{
"org.freedesktop.monado.auxiliary.MonadoView"
)
{
U_LOG_E
(
"Unexpected class name: %s"
,
U_LOG_E
(
"Unexpected class name: %s"
,
clazz_name
.
c_str
());
clazz_name
.
c_str
());
return
nullptr
;
return
nullptr
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment