Code normalization problems fixed.

Rair hangs on library installation fixed.

android/service/engine/jni/BinderComponent/BnOpenCVEngine.cpp

@@ -60,9 +60,7 @@ status_t BnOpenCVEngine::onTransact(uint32_t code, const Parcel& data, android::
             int res = reply->writeInt32(static_cast<int32_t>(result));
             LOGD("InstallVersion call to Binder finished with res %d", res);
             return res;
-
         } break;
-
         default:
         {
             LOGD("OpenCVEngine unknown request");

android/service/engine/jni/BinderComponent/HardwareDetector.cpp

@@ -174,8 +174,8 @@ int DetectKnownPlatforms()
 
     // NOTE: Uncomment when all Tegras will be supported
     /*if (tegra_status > 0)
-    {
-    return PLATFORM_TEGRA + tegra_status - 1;
+     *   {
+     *   return PLATFORM_TEGRA + tegra_status - 1;
      }
      else
      {

android/service/engine/jni/BinderComponent/OpenCVEngine.cpp

@@ -173,24 +173,16 @@ bool OpenCVEngine::InstallVersion(android::String16 version)
     std::string norm_version;
     bool result = false;
 
+    LOGD("OpenCVEngine::InstallVersion() begin");
+
     norm_version = NormalizeVersionString(std_version);
 
     if (!norm_version.empty())
-    {
-    LOGD("OpenCVEngine::InstallVersion() begin");
-
-    if (!PackageManager->CheckVersionInstalled(norm_version, Platform, CpuID))
     {
         LOGD("PackageManager->InstallVersion call");
         result = PackageManager->InstallVersion(norm_version, Platform, CpuID);
     }
     else
-    {
-        LOGI("Package OpenCV of version %s is already installed. Skiped.", norm_version.c_str());
-        result = true;
-    }
-    }
-    else
     {
         LOGE("OpenCV version \"%s\" is not supported", norm_version.c_str());
     }

android/service/engine/jni/BinderComponent/StringUtils.cpp

@@ -52,7 +52,6 @@ bool ParseString(const string& src, string& key, string& value)
 
 set<string> SplitString(const string& src, const char seporator)
 {
-
     set<string> result;
 
     if (!src.empty())

android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.cpp

@@ -67,4 +67,3 @@ JNIEXPORT void JNICALL Java_org_opencv_engine_BinderConnector_Final(JNIEnv *, jo
     delete PackageManager;
     PackageManager = NULL;
 }
-

android/service/engine/jni/NativeService/CommonPackageManager.cpp

@@ -41,7 +41,8 @@ bool CommonPackageManager::CheckVersionInstalled(const std::string& version, int
 
     if (!packages.empty())
     {
-    result = (packages.end() != find(packages.begin(), packages.end(), target_package));
+        vector<PackageInfo>::const_iterator it = find(packages.begin(), packages.end(), target_package);
+        result = (it != packages.end());
     }
     LOGD("CommonPackageManager::CheckVersionInstalled() end");
     return result;

android/service/engine/jni/Tests/OpenCVEngineTest.cpp

@@ -126,7 +126,7 @@ TEST(OpenCVEngineTest, GetPathForExecHWNewVersion)
     EXPECT_EQ(0, result.size());
 }
 
-#else
+#else // armeabi
 TEST(OpenCVEngineTest, GetPathForExecHWExistVersion)
 {
     sp<IOpenCVEngine> Engine = InitConnect();