diff --git a/android/service/engine/AndroidManifest.xml b/android/service/engine/AndroidManifest.xml index 4e7e77cc81..b8aea3ee46 100644 --- a/android/service/engine/AndroidManifest.xml +++ b/android/service/engine/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="16" + android:versionName="1.6" > @@ -17,7 +17,7 @@ - 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 6813164d09..9295146f8c 100644 --- a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java +++ b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java @@ -308,10 +308,19 @@ public class ManagerActivity extends Activity ActivePackagePath = mActivePackageMap.get(OpenCVersion); Log.d(TAG, OpenCVersion + " -> " + ActivePackagePath); - if (null != ActivePackagePath && ActivePackagePath.indexOf(mInstalledPackageInfo[i].packageName) >= 0) + if (null != ActivePackagePath) { - temp.put("Activity", "y"); - PublicName += " (in use)"; + int start = ActivePackagePath.indexOf(mInstalledPackageInfo[i].packageName); + int stop = start + mInstalledPackageInfo[i].packageName.length(); + if (start >= 0 && ActivePackagePath.charAt(stop) == '/') + { + temp.put("Activity", "y"); + PublicName += " (in use)"; + } + else + { + temp.put("Activity", "n"); + } } else {