javamanager/javainstaller/installer/src.s60/applicationregistrator/applicationregistrator.cpp
--- a/javamanager/javainstaller/installer/src.s60/applicationregistrator/applicationregistrator.cpp Thu May 27 12:49:31 2010 +0300
+++ b/javamanager/javainstaller/installer/src.s60/applicationregistrator/applicationregistrator.cpp Fri Jun 11 13:33:44 2010 +0300
@@ -129,7 +129,6 @@
return err;
}
-//#if 1
#ifndef RD_JAVA_USIF_APP_REG
// Delete any pending (un)registrations (possible if
// e.g. device rebooted before commit).
@@ -169,7 +168,6 @@
* @param[in] aBackground
* @return 0 if registration succeeded or Symbian error code
*/
-//#if 0
#ifdef RD_JAVA_USIF_APP_REG
JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_ApplicationRegistrator__1registerApplication
(JNIEnv */*aEnv*/, jclass /*aClass*/, jint /*aSessionHandle*/, jint /*aUid*/, jstring /*aGroupName*/,
@@ -486,7 +484,6 @@
* @param[in] aUid The Uid of the application to be unregistered..
* @return 0 if unregistration succeeded or Symbian error code
*/
-//#if 0
#ifdef RD_JAVA_USIF_APP_REG
JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_ApplicationRegistrator__1unregisterApplication
(JNIEnv *, jclass, jint /*aSessionHandle*/, jint /*aUid*/)
@@ -527,7 +524,6 @@
TInt err = KErrNone;
-//#if 1
#ifndef RD_JAVA_USIF_APP_REG
if (aSynchronous)
{
@@ -586,7 +582,6 @@
reinterpret_cast<RApaLsSession*>(aSessionHandle<<2);
TInt err = KErrNone;
-//#if 1
#ifndef RD_JAVA_USIF_APP_REG
err = pApaSession->RollbackNonNativeApplicationsUpdates();
#endif // RD_JAVA_USIF_APP_REG