--- a/javamanager/javasettings/appmngrplugin/src/appmngr2midletsettingshandler.cpp	Wed Sep 15 12:05:25 2010 +0300
+++ b/javamanager/javasettings/appmngrplugin/src/appmngr2midletsettingshandler.cpp	Wed Oct 13 14:23:59 2010 +0300
@@ -244,11 +244,9 @@
 
     findEntry(queryResult, VALUE, value);
 
-    if (value.size() > 0
-        && ((value == L"no")
-        || (value == L"navigationkeys")
-        || (value == L"gameactions")))
+    if (value.size() > 0)
     {
+        // default is KValueGameactions if value is not defined
         predefined = true;
     }
     LOG(EJavaAppMngrPlugin, EInfo, " - CAppMngr2MidletSettingsHandler::OnScreenKeypadValuePreDefinedL ");
@@ -306,7 +304,7 @@
     LOG(EJavaAppMngrPlugin, EInfo, " - CAppMngr2MidletSettingsHandler::SetCurrentSuiteSnapL ");
 }
 
-const std::wstring CAppMngr2MidletSettingsHandler::GetSecurityDomainCategoryL()
+const std::wstring CAppMngr2MidletSettingsHandler::GetSecurityDomainCategory()
 {
     wstring securityDomainCategory = L"";
 
@@ -325,7 +323,6 @@
     catch (JavaStorageException& aJse)
     {
         ELOG1(EJavaAppMngrPlugin, "SECURITY_DOMAIN_CATEGORY value read failed: %d", aJse.mStatus);
-        User::Leave(KErrLocked);
     }
 
     findEntry(queryResult, SECURITY_DOMAIN_CATEGORY, securityDomainCategory);
@@ -334,7 +331,7 @@
 
 }
 
-const std::wstring CAppMngr2MidletSettingsHandler::GetSecurityDomainNameL()
+const std::wstring CAppMngr2MidletSettingsHandler::GetSecurityDomainName()
 {
     wstring securityDomainName = L"";
 
@@ -353,7 +350,6 @@
     catch (JavaStorageException& aJse)
     {
         ELOG1(EJavaAppMngrPlugin, "SECURITY_DOMAIN value read failed: %d", aJse.mStatus);
-        User::Leave(KErrLocked);
     }
 
     findEntry(queryResult, SECURITY_DOMAIN, securityDomainName);