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
da1ddc75
Commit
da1ddc75
authored
Feb 14, 2013
by
Andrey Kamaev
Committed by
OpenCV Buildbot
Feb 14, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #487 from asmorkalov:manager_localref_fix
parents
f3874abf
6619941c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
JavaBasedPackageManager.cpp
...service/engine/jni/JNIWrapper/JavaBasedPackageManager.cpp
+4
-4
No files found.
android/service/engine/jni/JNIWrapper/JavaBasedPackageManager.cpp
View file @
da1ddc75
...
@@ -40,6 +40,7 @@ bool JavaBasedPackageManager::InstallPackage(const PackageInfo& package)
...
@@ -40,6 +40,7 @@ bool JavaBasedPackageManager::InstallPackage(const PackageInfo& package)
if
(
!
jmethod
)
if
(
!
jmethod
)
{
{
LOGE
(
"MarketConnector::GetAppFormMarket method was not found!"
);
LOGE
(
"MarketConnector::GetAppFormMarket method was not found!"
);
jenv
->
DeleteLocalRef
(
jclazz
);
return
false
;
return
false
;
}
}
...
@@ -74,7 +75,6 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
...
@@ -74,7 +75,6 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
JavaContext
->
AttachCurrentThread
(
&
jenv
,
NULL
);
JavaContext
->
AttachCurrentThread
(
&
jenv
,
NULL
);
}
}
LOGD
(
"GetObjectClass call"
);
jclass
jclazz
=
jenv
->
GetObjectClass
(
JavaPackageManager
);
jclass
jclazz
=
jenv
->
GetObjectClass
(
JavaPackageManager
);
if
(
!
jclazz
)
if
(
!
jclazz
)
{
{
...
@@ -82,15 +82,14 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
...
@@ -82,15 +82,14 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
return
result
;
return
result
;
}
}
LOGD
(
"GetMethodID call"
);
jmethodID
jmethod
=
jenv
->
GetMethodID
(
jclazz
,
"GetInstalledOpenCVPackages"
,
"()[Landroid/content/pm/PackageInfo;"
);
jmethodID
jmethod
=
jenv
->
GetMethodID
(
jclazz
,
"GetInstalledOpenCVPackages"
,
"()[Landroid/content/pm/PackageInfo;"
);
if
(
!
jmethod
)
if
(
!
jmethod
)
{
{
LOGE
(
"MarketConnector::GetInstalledOpenCVPackages method was not found!"
);
LOGE
(
"MarketConnector::GetInstalledOpenCVPackages method was not found!"
);
jenv
->
DeleteLocalRef
(
jclazz
);
return
result
;
return
result
;
}
}
LOGD
(
"Java package manager call"
);
jobjectArray
jpkgs
=
static_cast
<
jobjectArray
>
(
jenv
->
CallNonvirtualObjectMethod
(
JavaPackageManager
,
jclazz
,
jmethod
));
jobjectArray
jpkgs
=
static_cast
<
jobjectArray
>
(
jenv
->
CallNonvirtualObjectMethod
(
JavaPackageManager
,
jclazz
,
jmethod
));
jsize
size
=
jenv
->
GetArrayLength
(
jpkgs
);
jsize
size
=
jenv
->
GetArrayLength
(
jpkgs
);
...
@@ -102,7 +101,6 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
...
@@ -102,7 +101,6 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
{
{
jobject
jtmp
=
jenv
->
GetObjectArrayElement
(
jpkgs
,
i
);
jobject
jtmp
=
jenv
->
GetObjectArrayElement
(
jpkgs
,
i
);
PackageInfo
tmp
=
ConvertPackageFromJava
(
jtmp
,
jenv
);
PackageInfo
tmp
=
ConvertPackageFromJava
(
jtmp
,
jenv
);
jenv
->
DeleteLocalRef
(
jtmp
);
if
(
tmp
.
IsValid
())
if
(
tmp
.
IsValid
())
result
.
push_back
(
tmp
);
result
.
push_back
(
tmp
);
...
@@ -137,6 +135,7 @@ static jint GetAndroidVersion(JNIEnv* jenv)
...
@@ -137,6 +135,7 @@ static jint GetAndroidVersion(JNIEnv* jenv)
PackageInfo
JavaBasedPackageManager
::
ConvertPackageFromJava
(
jobject
package
,
JNIEnv
*
jenv
)
PackageInfo
JavaBasedPackageManager
::
ConvertPackageFromJava
(
jobject
package
,
JNIEnv
*
jenv
)
{
{
jclass
jclazz
=
jenv
->
GetObjectClass
(
package
);
jclass
jclazz
=
jenv
->
GetObjectClass
(
package
);
jfieldID
jfield
=
jenv
->
GetFieldID
(
jclazz
,
"packageName"
,
"Ljava/lang/String;"
);
jfieldID
jfield
=
jenv
->
GetFieldID
(
jclazz
,
"packageName"
,
"Ljava/lang/String;"
);
jstring
jnameobj
=
static_cast
<
jstring
>
(
jenv
->
GetObjectField
(
package
,
jfield
));
jstring
jnameobj
=
static_cast
<
jstring
>
(
jenv
->
GetObjectField
(
package
,
jfield
));
const
char
*
jnamestr
=
jenv
->
GetStringUTFChars
(
jnameobj
,
NULL
);
const
char
*
jnamestr
=
jenv
->
GetStringUTFChars
(
jnameobj
,
NULL
);
...
@@ -148,6 +147,7 @@ PackageInfo JavaBasedPackageManager::ConvertPackageFromJava(jobject package, JNI
...
@@ -148,6 +147,7 @@ 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
);
jenv
->
DeleteLocalRef
(
jclazz
);
static
const
jint
api_level
=
GetAndroidVersion
(
jenv
);
static
const
jint
api_level
=
GetAndroidVersion
(
jenv
);
...
...
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