Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
9f9c333a
Commit
9f9c333a
authored
Feb 11, 2013
by
Alexander Smorkalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #2759 android.os.DeadObjectException on OpenCV Manager connection fixed.
DeleteLocalRef calls for jclass objects added.
parent
716e0192
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
3 deletions
+22
-3
JavaBasedPackageManager.cpp
...service/engine/jni/JNIWrapper/JavaBasedPackageManager.cpp
+22
-3
No files found.
android/service/engine/jni/JNIWrapper/JavaBasedPackageManager.cpp
View file @
9f9c333a
...
@@ -46,7 +46,9 @@ bool JavaBasedPackageManager::InstallPackage(const PackageInfo& package)
...
@@ -46,7 +46,9 @@ bool JavaBasedPackageManager::InstallPackage(const PackageInfo& package)
LOGD
(
"Calling java package manager with package name %s
\n
"
,
package
.
GetFullName
().
c_str
());
LOGD
(
"Calling java package manager with package name %s
\n
"
,
package
.
GetFullName
().
c_str
());
jobject
jpkgname
=
jenv
->
NewStringUTF
(
package
.
GetFullName
().
c_str
());
jobject
jpkgname
=
jenv
->
NewStringUTF
(
package
.
GetFullName
().
c_str
());
bool
result
=
jenv
->
CallNonvirtualBooleanMethod
(
JavaPackageManager
,
jclazz
,
jmethod
,
jpkgname
);
bool
result
=
jenv
->
CallNonvirtualBooleanMethod
(
JavaPackageManager
,
jclazz
,
jmethod
,
jpkgname
);
jenv
->
DeleteLocalRef
(
jpkgname
);
jenv
->
DeleteLocalRef
(
jpkgname
);
jenv
->
DeleteLocalRef
(
jclazz
);
if
(
self_attached
)
if
(
self_attached
)
{
{
...
@@ -104,9 +106,12 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
...
@@ -104,9 +106,12 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
if
(
tmp
.
IsValid
())
if
(
tmp
.
IsValid
())
result
.
push_back
(
tmp
);
result
.
push_back
(
tmp
);
jenv
->
DeleteLocalRef
(
jtmp
);
}
}
jenv
->
DeleteLocalRef
(
jpkgs
);
jenv
->
DeleteLocalRef
(
jpkgs
);
jenv
->
DeleteLocalRef
(
jclazz
);
if
(
self_attached
)
if
(
self_attached
)
{
{
...
@@ -118,6 +123,16 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
...
@@ -118,6 +123,16 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
return
result
;
return
result
;
}
}
static
jint
GetAndroidVersion
(
JNIEnv
*
jenv
)
{
jclass
jclazz
=
jenv
->
FindClass
(
"android/os/Build$VERSION"
);
jfieldID
jfield
=
jenv
->
GetStaticFieldID
(
jclazz
,
"SDK_INT"
,
"I"
);
jint
api_level
=
jenv
->
GetStaticIntField
(
jclazz
,
jfield
);
jenv
->
DeleteLocalRef
(
jclazz
);
return
api_level
;
}
// IMPORTANT: This method can be called only if thread is attached to Dalvik
// IMPORTANT: This method can be called only if thread is attached to Dalvik
PackageInfo
JavaBasedPackageManager
::
ConvertPackageFromJava
(
jobject
package
,
JNIEnv
*
jenv
)
PackageInfo
JavaBasedPackageManager
::
ConvertPackageFromJava
(
jobject
package
,
JNIEnv
*
jenv
)
{
{
...
@@ -133,23 +148,27 @@ PackageInfo JavaBasedPackageManager::ConvertPackageFromJava(jobject package, JNI
...
@@ -133,23 +148,27 @@ PackageInfo JavaBasedPackageManager::ConvertPackageFromJava(jobject package, JNI
const
char
*
jversionstr
=
jenv
->
GetStringUTFChars
(
jversionobj
,
NULL
);
const
char
*
jversionstr
=
jenv
->
GetStringUTFChars
(
jversionobj
,
NULL
);
string
verison
(
jversionstr
);
string
verison
(
jversionstr
);
jenv
->
DeleteLocalRef
(
jversionobj
);
jenv
->
DeleteLocalRef
(
jversionobj
);
jenv
->
DeleteLocalRef
(
jclazz
);
static
const
jint
api_level
=
GetAndroidVersion
(
jenv
);
string
path
;
string
path
;
jclazz
=
jenv
->
FindClass
(
"android/os/Build$VERSION"
);
jfield
=
jenv
->
GetStaticFieldID
(
jclazz
,
"SDK_INT"
,
"I"
);
jint
api_level
=
jenv
->
GetStaticIntField
(
jclazz
,
jfield
);
if
(
api_level
>
8
)
if
(
api_level
>
8
)
{
{
jclazz
=
jenv
->
GetObjectClass
(
package
);
jclazz
=
jenv
->
GetObjectClass
(
package
);
jfield
=
jenv
->
GetFieldID
(
jclazz
,
"applicationInfo"
,
"Landroid/content/pm/ApplicationInfo;"
);
jfield
=
jenv
->
GetFieldID
(
jclazz
,
"applicationInfo"
,
"Landroid/content/pm/ApplicationInfo;"
);
jobject
japp_info
=
jenv
->
GetObjectField
(
package
,
jfield
);
jobject
japp_info
=
jenv
->
GetObjectField
(
package
,
jfield
);
jenv
->
DeleteLocalRef
(
jclazz
);
jclazz
=
jenv
->
GetObjectClass
(
japp_info
);
jclazz
=
jenv
->
GetObjectClass
(
japp_info
);
jfield
=
jenv
->
GetFieldID
(
jclazz
,
"nativeLibraryDir"
,
"Ljava/lang/String;"
);
jfield
=
jenv
->
GetFieldID
(
jclazz
,
"nativeLibraryDir"
,
"Ljava/lang/String;"
);
jstring
jpathobj
=
static_cast
<
jstring
>
(
jenv
->
GetObjectField
(
japp_info
,
jfield
));
jstring
jpathobj
=
static_cast
<
jstring
>
(
jenv
->
GetObjectField
(
japp_info
,
jfield
));
const
char
*
jpathstr
=
jenv
->
GetStringUTFChars
(
jpathobj
,
NULL
);
const
char
*
jpathstr
=
jenv
->
GetStringUTFChars
(
jpathobj
,
NULL
);
path
=
string
(
jpathstr
);
path
=
string
(
jpathstr
);
jenv
->
ReleaseStringUTFChars
(
jpathobj
,
jpathstr
);
jenv
->
ReleaseStringUTFChars
(
jpathobj
,
jpathstr
);
jenv
->
DeleteLocalRef
(
japp_info
);
jenv
->
DeleteLocalRef
(
jpathobj
);
jenv
->
DeleteLocalRef
(
jpathobj
);
jenv
->
DeleteLocalRef
(
jclazz
);
}
}
else
else
{
{
...
...
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