From a0c504aabc8236807013e13087c34bcba733e434 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 4 Dec 2012 14:23:25 +0400
Subject: [PATCH 1/5] Initial stub for OpenCVLibraryInfo class added.

---
 android/service/engine/build.xml              |  2 +-
 android/service/engine/jni/Android.mk         |  3 +-
 .../jni/JNIWrapper/OpenCVLibraryInfo.cpp      | 37 +++++++++++++++
 .../engine/jni/JNIWrapper/OpenCVLibraryInfo.h | 30 ++++++++++++
 android/service/engine/project.properties     |  2 +-
 .../org/opencv/engine/OpenCVLibraryInfo.java  | 47 +++++++++++++++++++
 6 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
 create mode 100644 android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
 create mode 100644 android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java

diff --git a/android/service/engine/build.xml b/android/service/engine/build.xml
index a16a4fefba..98ddc3eac1 100644
--- a/android/service/engine/build.xml
+++ b/android/service/engine/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="ManagerActivity" default="help">
+<project name="OpenCV Manager" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/android/service/engine/jni/Android.mk b/android/service/engine/jni/Android.mk
index 9ab92a2089..71d2c464c9 100644
--- a/android/service/engine/jni/Android.mk
+++ b/android/service/engine/jni/Android.mk
@@ -52,7 +52,8 @@ LOCAL_SRC_FILES := \
     NativeService/CommonPackageManager.cpp \
     JNIWrapper/JavaBasedPackageManager.cpp \
     NativeService/PackageInfo.cpp \
-    JNIWrapper/HardwareDetector_jni.cpp
+    JNIWrapper/HardwareDetector_jni.cpp \
+    JNIWrapper/OpenCVLibraryInfo.cpp
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
diff --git a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
new file mode 100644
index 0000000000..9d9fdbf234
--- /dev/null
+++ b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
@@ -0,0 +1,37 @@
+#include "OpenCVLibraryInfo.h"
+
+JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open
+  (JNIEnv * env, jobject, jstring)
+{
+    return 255;
+}
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageName
+  (JNIEnv* env, jobject, jlong)
+{
+    return env->NewStringUTF("org.opencv.lib_v24_tegra3");
+}
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPublicName
+(JNIEnv* env, jobject, jlong)
+{
+    return env->NewStringUTF("OpenCV library for Tegra3");
+}
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList
+  (JNIEnv* env, jobject, jlong)
+{
+    return env->NewStringUTF("");
+}
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getVersionName
+  (JNIEnv* env, jobject, jlong)
+{
+    return env->NewStringUTF("9.9");
+}
+
+JNIEXPORT void JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_close
+  (JNIEnv* env, jobject, jlong)
+{
+
+}
diff --git a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
new file mode 100644
index 0000000000..ffd29c7d1f
--- /dev/null
+++ b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
@@ -0,0 +1,30 @@
+#include <jni.h>
+
+#ifndef _Included_org_opencv_engine_OpenCVLibraryInfo
+#define _Included_org_opencv_engine_OpenCVLibraryInfo
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open
+  (JNIEnv *, jobject, jstring);
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageName
+  (JNIEnv *, jobject, jlong);
+
+  JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPublicName
+  (JNIEnv *, jobject, jlong);
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList
+  (JNIEnv *, jobject, jlong);
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getVersionName
+  (JNIEnv *, jobject, jlong);
+
+JNIEXPORT void JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_close
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/android/service/engine/project.properties b/android/service/engine/project.properties
index 85aac54016..b7c2081d56 100644
--- a/android/service/engine/project.properties
+++ b/android/service/engine/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-8
+target=android-10
diff --git a/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java b/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
new file mode 100644
index 0000000000..c1709b81ba
--- /dev/null
+++ b/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
@@ -0,0 +1,47 @@
+package org.opencv.engine;
+
+public class OpenCVLibraryInfo {
+    public OpenCVLibraryInfo(String packagePath) {
+        mNativeObj = open(packagePath);
+        if (mNativeObj != 0) {
+            mPackageName = getPackageName(mNativeObj);
+            mLibraryList = getLibraryList(mNativeObj);
+            mVersionName = getVersionName(mNativeObj);
+            mPublicName = getPublicName(mNativeObj);
+            close(mNativeObj);
+        }
+    }
+
+    public boolean status() {
+        return (mNativeObj != 0);
+    }
+
+    public String packageName() {
+        return mPackageName;
+    }
+
+    public String publicName() {
+        return mPublicName;
+    }
+
+    public String libraryList() {
+        return mLibraryList;
+    }
+
+    public String versionName() {
+        return mVersionName;
+    }
+
+    private long mNativeObj;
+    private String mPackageName;
+    private String mPublicName;
+    private String mLibraryList;
+    private String mVersionName;
+
+    private native long open(String packagePath);
+    private native String getPackageName(long obj);
+    private native String getPublicName(long obj);
+    private native String getLibraryList(long obj);
+    private native String getVersionName(long obj);
+    private native void close(long obj);
+}

From 9823b7cd0846ac8442ac231dc0753bcfc0e354ff Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 4 Dec 2012 15:37:27 +0400
Subject: [PATCH 2/5] Internal version of OpenCV inside OpenCV Manager added to
 the list of installed packages.

---
 .../org/opencv/engine/MarketConnector.java    | 16 +++-----
 .../engine/manager/ManagerActivity.java       | 37 ++++++++++++++++---
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/android/service/engine/src/org/opencv/engine/MarketConnector.java b/android/service/engine/src/org/opencv/engine/MarketConnector.java
index 5a5c098686..da595915f2 100644
--- a/android/service/engine/src/org/opencv/engine/MarketConnector.java
+++ b/android/service/engine/src/org/opencv/engine/MarketConnector.java
@@ -20,8 +20,6 @@ public class MarketConnector
     private static final String TAG = "OpenCVEngine/MarketConnector";
     protected Context mContext;
 
-    public boolean mIncludeManager = true;
-
     public MarketConnector(Context context)
     {
         mContext = context;
@@ -100,15 +98,13 @@ public class MarketConnector
     {
         List<PackageInfo> AllPackages = mContext.getPackageManager().getInstalledPackages(PackageManager.GET_CONFIGURATIONS);
         List<PackageInfo> OpenCVPackages = new ArrayList<PackageInfo>();
-        if (mIncludeManager)
-        {
-            try {
-                OpenCVPackages.add(mContext.getPackageManager().getPackageInfo("org.opencv.engine", PackageManager.GET_CONFIGURATIONS));
-            } catch (NameNotFoundException e) {
-                Log.e(TAG, "OpenCV Manager package info was not found!");
-                e.printStackTrace();
-            }
+        try {
+            OpenCVPackages.add(mContext.getPackageManager().getPackageInfo("org.opencv.engine", PackageManager.GET_CONFIGURATIONS));
+        } catch (NameNotFoundException e) {
+            Log.e(TAG, "OpenCV Manager package info was not found!");
+            e.printStackTrace();
         }
+
         Iterator<PackageInfo> it = AllPackages.iterator();
         while(it.hasNext())
         {
diff --git a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
index 8bb2cd76ed..6515715059 100644
--- a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
+++ b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
@@ -7,7 +7,9 @@ import java.util.StringTokenizer;
 import org.opencv.engine.HardwareDetector;
 import org.opencv.engine.MarketConnector;
 import org.opencv.engine.OpenCVEngineInterface;
+import org.opencv.engine.OpenCVLibraryInfo;
 import org.opencv.engine.R;
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
@@ -266,10 +268,10 @@ public class ManagerActivity extends Activity
         }
     };
 
+    @TargetApi(Build.VERSION_CODES.GINGERBREAD)
     synchronized protected void FillPackageList()
     {
         synchronized (mListViewItems) {
-            mMarket.mIncludeManager = false;
             mInstalledPackageInfo = mMarket.GetInstalledOpenCVPackages();
             mListViewItems.clear();
 
@@ -277,12 +279,36 @@ public class ManagerActivity extends Activity
             {
                 // Convert to Items for package list view
                 HashMap<String,String> temp = new HashMap<String,String>();
-                String PublicName = mMarket.GetApplicationName(mInstalledPackageInfo[i].applicationInfo);
 
-                int idx = 0;
+                String PackageName = "";
+                String PublicName = "";
                 String OpenCVersion = "unknown";
                 String HardwareName = "";
-                StringTokenizer tokenizer = new StringTokenizer(mInstalledPackageInfo[i].packageName, "_");
+                String NativeLibDir = "";
+                String VersionName = "";
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD)
+                    NativeLibDir = mInstalledPackageInfo[i].applicationInfo.nativeLibraryDir;
+                else
+                    NativeLibDir = "/data/data/" + mInstalledPackageInfo[i].packageName + "/lib";
+
+                OpenCVLibraryInfo nativeInfo = new OpenCVLibraryInfo(NativeLibDir);
+
+                if (nativeInfo.status())
+                {
+                    PublicName = nativeInfo.publicName();
+                    PackageName = nativeInfo.packageName();
+                    VersionName = nativeInfo.versionName();
+                }
+                else
+                {
+                    PublicName = mMarket.GetApplicationName(mInstalledPackageInfo[i].applicationInfo);
+                    PackageName = mInstalledPackageInfo[i].packageName;
+                    VersionName = mInstalledPackageInfo[i].versionName;
+                }
+
+                int idx = 0;
+                StringTokenizer tokenizer = new StringTokenizer(PackageName, "_");
                 while (tokenizer.hasMoreTokens())
                 {
                     if (idx == 1)
@@ -326,8 +352,9 @@ public class ManagerActivity extends Activity
                 }
 
                 temp.put("Name", PublicName);
-                temp.put("Version", NormalizeVersion(OpenCVersion, mInstalledPackageInfo[i].versionName));
+                temp.put("Version", NormalizeVersion(OpenCVersion, VersionName));
                 temp.put("Hardware", HardwareName);
+
                 mListViewItems.add(temp);
             }
 

From 0f64f847b25df1cdd66fd8dda36dd42c56d30469 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 4 Dec 2012 16:34:53 +0400
Subject: [PATCH 3/5] Info library loading implemeneted.

---
 .../jni/JNIWrapper/OpenCVLibraryInfo.cpp      | 93 ++++++++++++++++---
 .../org/opencv/engine/OpenCVLibraryInfo.java  |  2 +-
 2 files changed, 83 insertions(+), 12 deletions(-)

diff --git a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
index 9d9fdbf234..7a88907dbe 100644
--- a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
+++ b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
@@ -1,37 +1,108 @@
 #include "OpenCVLibraryInfo.h"
+#include "EngineCommon.h"
+#include <utils/Log.h>
+#include <dlfcn.h>
 
 JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open
-  (JNIEnv * env, jobject, jstring)
+  (JNIEnv * env, jobject, jstring str)
 {
-    return 255;
+    const char* infoLibPath = env->GetStringUTFChars(str, NULL);
+    if (infoLibPath == NULL)
+        return 0;
+
+    LOGD("Trying to load info library \"%s\"", infoLibPath);
+
+    void* handle;
+
+    handle = dlopen(infoLibPath, RTLD_LAZY);
+    if (handle == NULL)
+        LOGI("Info library not found by path \"%s\"", infoLibPath);
+
+    return (jlong)handle;
 }
 
 JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageName
-  (JNIEnv* env, jobject, jlong)
+  (JNIEnv* env, jobject, jlong handle)
 {
-    return env->NewStringUTF("org.opencv.lib_v24_tegra3");
+    const char* (*info_func)();
+    const char* result;
+    const char* error;
+
+    dlerror();
+    *(void **) (&info_func) = dlsym((void*)handle, "GetPackageName");
+    if ((error = dlerror()) == NULL)
+        result = (*info_func)();
+    else
+    {
+        LOGE("dlsym error: \"%s\"", error);
+        result = "unknown";
+    }
+
+    return env->NewStringUTF(result);
 }
 
 JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPublicName
 (JNIEnv* env, jobject, jlong)
 {
-    return env->NewStringUTF("OpenCV library for Tegra3");
+    const char* (*info_func)();
+    const char* result;
+    const char* error;
+
+    dlerror();
+    *(void **) (&info_func) = dlsym((void*)handle, "GetPublicName");
+    if ((error = dlerror()) == NULL)
+        result = (*info_func)();
+    else
+    {
+        LOGE("dlsym error: \"%s\"", error);
+        result = "unknown";
+    }
+
+    return env->NewStringUTF(result);
 }
 
 JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList
-  (JNIEnv* env, jobject, jlong)
+  (JNIEnv* env, jobject, jlong handle)
 {
-    return env->NewStringUTF("");
+    const char* (*info_func)();
+    const char* result;
+    const char* error;
+
+    dlerror();
+    *(void **) (&info_func) = dlsym((void*)handle, "GetLibraryList");
+    if ((error = dlerror()) == NULL)
+        result = (*info_func)();
+    else
+    {
+        LOGE("dlsym error: \"%s\"", error);
+        result = "unknown";
+    }
+
+    return env->NewStringUTF(result);
 }
 
 JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getVersionName
-  (JNIEnv* env, jobject, jlong)
+  (JNIEnv* env, jobject, jlong handle)
 {
-    return env->NewStringUTF("9.9");
+    const char* (*info_func)();
+    const char* result;
+    const char* error;
+
+    dlerror();
+    *(void **) (&info_func) = dlsym((void*)handle, "GetRevision");
+    if ((error = dlerror()) == NULL)
+        result = (*info_func)();
+    else
+    {
+        LOGE("dlsym error: \"%s\"", error);
+        result = "unknown";
+    }
+
+    return env->NewStringUTF(result);
 }
 
 JNIEXPORT void JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_close
-  (JNIEnv* env, jobject, jlong)
+  (JNIEnv*, jobject, jlong handle)
 {
-
+    dlclose((void*)handle);
 }
diff --git a/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java b/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
index c1709b81ba..55ae368584 100644
--- a/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
+++ b/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
@@ -2,7 +2,7 @@ package org.opencv.engine;
 
 public class OpenCVLibraryInfo {
     public OpenCVLibraryInfo(String packagePath) {
-        mNativeObj = open(packagePath);
+        mNativeObj = open(packagePath + "/libopencv_info.so");
         if (mNativeObj != 0) {
             mPackageName = getPackageName(mNativeObj);
             mLibraryList = getLibraryList(mNativeObj);

From 4ebcf2b224f318057ca3b4218a31c1c5ba540816 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 4 Dec 2012 18:04:11 +0400
Subject: [PATCH 4/5] GetPublicName function removed for OpenCV LibraryInfo
 class; Some OpenCV Manager UI behavior updates; CMake build fix.

---
 android/service/engine/CMakeLists.txt         |  2 +-
 .../jni/JNIWrapper/OpenCVLibraryInfo.cpp      | 20 -----
 .../engine/jni/JNIWrapper/OpenCVLibraryInfo.h |  3 -
 android/service/engine/project.properties     |  2 +-
 .../org/opencv/engine/OpenCVLibraryInfo.java  |  7 --
 .../engine/manager/ManagerActivity.java       | 74 +++++++++++++------
 6 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/android/service/engine/CMakeLists.txt b/android/service/engine/CMakeLists.txt
index 5b723867ca..14066831a6 100644
--- a/android/service/engine/CMakeLists.txt
+++ b/android/service/engine/CMakeLists.txt
@@ -2,7 +2,7 @@ set(engine OpenCVEngine)
 set(JNI_LIB_NAME ${engine} ${engine}_jni)
 
 unset(__android_project_chain CACHE)
-add_android_project(opencv_engine "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 8 ${ANDROID_SDK_TARGET} IGNORE_JAVA ON IGNORE_MANIFEST ON )
+add_android_project(opencv_engine "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 9 ${ANDROID_SDK_TARGET} IGNORE_JAVA ON IGNORE_MANIFEST ON )
 
 set(ANDROID_PLATFORM_VERSION_CODE "0")
 
diff --git a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
index 7a88907dbe..c1cbccfe83 100644
--- a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
+++ b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
@@ -41,26 +41,6 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageNam
     return env->NewStringUTF(result);
 }
 
-JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPublicName
-(JNIEnv* env, jobject, jlong)
-{
-    const char* (*info_func)();
-    const char* result;
-    const char* error;
-
-    dlerror();
-    *(void **) (&info_func) = dlsym((void*)handle, "GetPublicName");
-    if ((error = dlerror()) == NULL)
-        result = (*info_func)();
-    else
-    {
-        LOGE("dlsym error: \"%s\"", error);
-        result = "unknown";
-    }
-
-    return env->NewStringUTF(result);
-}
-
 JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList
   (JNIEnv* env, jobject, jlong handle)
 {
diff --git a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
index ffd29c7d1f..b02050ffde 100644
--- a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
+++ b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
@@ -12,9 +12,6 @@ JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open
 JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageName
   (JNIEnv *, jobject, jlong);
 
-  JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPublicName
-  (JNIEnv *, jobject, jlong);
-
 JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList
   (JNIEnv *, jobject, jlong);
 
diff --git a/android/service/engine/project.properties b/android/service/engine/project.properties
index b7c2081d56..c6998b3d10 100644
--- a/android/service/engine/project.properties
+++ b/android/service/engine/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-10
+target=android-9
diff --git a/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java b/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
index 55ae368584..d0f67bfde0 100644
--- a/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
+++ b/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
@@ -7,7 +7,6 @@ public class OpenCVLibraryInfo {
             mPackageName = getPackageName(mNativeObj);
             mLibraryList = getLibraryList(mNativeObj);
             mVersionName = getVersionName(mNativeObj);
-            mPublicName = getPublicName(mNativeObj);
             close(mNativeObj);
         }
     }
@@ -20,10 +19,6 @@ public class OpenCVLibraryInfo {
         return mPackageName;
     }
 
-    public String publicName() {
-        return mPublicName;
-    }
-
     public String libraryList() {
         return mLibraryList;
     }
@@ -34,13 +29,11 @@ public class OpenCVLibraryInfo {
 
     private long mNativeObj;
     private String mPackageName;
-    private String mPublicName;
     private String mLibraryList;
     private String mVersionName;
 
     private native long open(String packagePath);
     private native String getPackageName(long obj);
-    private native String getPublicName(long obj);
     private native String getLibraryList(long obj);
     private native String getVersionName(long obj);
     private native void close(long obj);
diff --git a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
index 6515715059..f49ce8c07d 100644
--- a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
+++ b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
@@ -79,7 +79,7 @@ public class ManagerActivity extends Activity
             {
                 HardwarePlatformView.setText("Tegra");
             }
-            else if (HardwareDetector.PLATFORM_TEGRA == Platfrom)
+            else if (HardwareDetector.PLATFORM_TEGRA2 == Platfrom)
             {
                 HardwarePlatformView.setText("Tegra 2");
             }
@@ -172,9 +172,12 @@ public class ManagerActivity extends Activity
 
         mInstalledPackageView.setOnItemClickListener(new OnItemClickListener() {
 
-            public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long id) {
-                mInstalledPackageView.setTag(Integer.valueOf((int)id));
-                mActionDialog.show();
+            public void onItemClick(AdapterView<?> adapter, View view, int position, long id) {
+                if (!mInstalledPackageInfo[(int) id].packageName.equals("org.opencv.engine"))
+                {
+                    mInstalledPackageView.setTag(Integer.valueOf((int)id));
+                    mActionDialog.show();
+                }
             }
         });
 
@@ -234,8 +237,6 @@ public class ManagerActivity extends Activity
     protected class OpenCVEngineServiceConnection implements ServiceConnection
     {
         public void onServiceDisconnected(ComponentName name) {
-            // TODO Auto-generated method stub
-
         }
 
         public void onServiceConnected(ComponentName name, IBinder service) {
@@ -280,34 +281,36 @@ public class ManagerActivity extends Activity
                 // Convert to Items for package list view
                 HashMap<String,String> temp = new HashMap<String,String>();
 
-                String PackageName = "";
-                String PublicName = "";
-                String OpenCVersion = "unknown";
                 String HardwareName = "";
                 String NativeLibDir = "";
-                String VersionName = "";
+                String OpenCVersion = "";
+
+                String PublicName = mMarket.GetApplicationName(mInstalledPackageInfo[i].applicationInfo);
+                String PackageName = mInstalledPackageInfo[i].packageName;
+                String VersionName = mInstalledPackageInfo[i].versionName;
+
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD)
                     NativeLibDir = mInstalledPackageInfo[i].applicationInfo.nativeLibraryDir;
                 else
                     NativeLibDir = "/data/data/" + mInstalledPackageInfo[i].packageName + "/lib";
 
-                OpenCVLibraryInfo nativeInfo = new OpenCVLibraryInfo(NativeLibDir);
+                OpenCVLibraryInfo NativeInfo = new OpenCVLibraryInfo(NativeLibDir);
 
-                if (nativeInfo.status())
+                if (PackageName.equals("org.opencv.engine"))
                 {
-                    PublicName = nativeInfo.publicName();
-                    PackageName = nativeInfo.packageName();
-                    VersionName = nativeInfo.versionName();
-                }
-                else
-                {
-                    PublicName = mMarket.GetApplicationName(mInstalledPackageInfo[i].applicationInfo);
-                    PackageName = mInstalledPackageInfo[i].packageName;
-                    VersionName = mInstalledPackageInfo[i].versionName;
+                    if (NativeInfo.status())
+                    {
+                        PublicName = "Built-in OpenCV library";
+                        PackageName = NativeInfo.packageName();
+                        VersionName = NativeInfo.versionName();
+                    }
+                    else
+                        continue;
                 }
 
                 int idx = 0;
+                Log.d(TAG, PackageName);
                 StringTokenizer tokenizer = new StringTokenizer(PackageName, "_");
                 while (tokenizer.hasMoreTokens())
                 {
@@ -329,6 +332,7 @@ public class ManagerActivity extends Activity
                 }
 
                 String ActivePackagePath;
+                String Tags = null;
                 ActivePackagePath = mActivePackageMap.get(OpenCVersion);
                 Log.d(TAG, OpenCVersion + " -> " + ActivePackagePath);
 
@@ -339,7 +343,7 @@ public class ManagerActivity extends Activity
                     if (start >= 0 && ActivePackagePath.charAt(stop) == '/')
                     {
                         temp.put("Activity", "y");
-                        PublicName += " (in use)";
+                        Tags = "active";
                     }
                     else
                     {
@@ -351,9 +355,31 @@ public class ManagerActivity extends Activity
                     temp.put("Activity", "n");
                 }
 
-                temp.put("Name", PublicName);
                 temp.put("Version", NormalizeVersion(OpenCVersion, VersionName));
-                temp.put("Hardware", HardwareName);
+                // HACK: OpenCV Manager for Armv7-a Neon already has Tegra3 optimizations
+                // that is enabled on proper hardware
+                if (HardwareDetector.DetectKnownPlatforms() == HardwareDetector.PLATFORM_TEGRA3 &&
+                  HardwareName.equals("armv7a neon ") &&  Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD)
+                {
+                    temp.put("Hardware", "Tegra 3");
+                    if (Tags == null)
+                    {
+                        Tags = "optimized";
+                    }
+                    else
+                    {
+                        Tags = Tags + ", optimized";
+                    }
+                }
+                else
+                {
+                    temp.put("Hardware", HardwareName);
+                }
+
+                if (Tags != null)
+                    PublicName = PublicName + " (" + Tags + ")";
+
+                temp.put("Name", PublicName);
 
                 mListViewItems.add(temp);
             }

From 257d8df1d49c7d078ce7f1ed368a3d5d6c33685a Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Thu, 6 Dec 2012 14:11:30 +0400
Subject: [PATCH 5/5] Bug with skiped packages fixed.

---
 .../org/opencv/engine/manager/ManagerActivity.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
index f49ce8c07d..13f6c8f50f 100644
--- a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
+++ b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
@@ -173,6 +173,7 @@ public class ManagerActivity extends Activity
         mInstalledPackageView.setOnItemClickListener(new OnItemClickListener() {
 
             public void onItemClick(AdapterView<?> adapter, View view, int position, long id) {
+                //if (!mListViewItems.get((int) id).get("Name").equals("Built-in OpenCV library"));
                 if (!mInstalledPackageInfo[(int) id].packageName.equals("org.opencv.engine"))
                 {
                     mInstalledPackageView.setTag(Integer.valueOf((int)id));
@@ -276,8 +277,12 @@ public class ManagerActivity extends Activity
             mInstalledPackageInfo = mMarket.GetInstalledOpenCVPackages();
             mListViewItems.clear();
 
-            for (int i = 0; i < mInstalledPackageInfo.length; i++)
+            int RealPackageCount = mInstalledPackageInfo.length;
+            for (int i = 0; i < RealPackageCount; i++)
             {
+                if (mInstalledPackageInfo[i] == null)
+                    break;
+
                 // Convert to Items for package list view
                 HashMap<String,String> temp = new HashMap<String,String>();
 
@@ -289,7 +294,6 @@ public class ManagerActivity extends Activity
                 String PackageName = mInstalledPackageInfo[i].packageName;
                 String VersionName = mInstalledPackageInfo[i].versionName;
 
-
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD)
                     NativeLibDir = mInstalledPackageInfo[i].applicationInfo.nativeLibraryDir;
                 else
@@ -306,7 +310,13 @@ public class ManagerActivity extends Activity
                         VersionName = NativeInfo.versionName();
                     }
                     else
+                    {
+                        mInstalledPackageInfo[i] = mInstalledPackageInfo[RealPackageCount-1];
+                        mInstalledPackageInfo[RealPackageCount-1] = null;
+                        RealPackageCount--;
+                        i--;
                         continue;
+                    }
                 }
 
                 int idx = 0;