Removed factory_widget field from WidgetExtendedInfo DB table.

[Issue#] Factory_widget not used anymore.
[Bug] KW comments, spelling mistake in table name. Unused factory_widget property.
[Cause] N/A
[Solution] Removed factory_widget and related methods, error codes, exceptions.
[Verification] Build wrt-installer. No undefined symbols = OK

Change-Id: I3114e096e25aa7abf8657227199253f75e5065bf

diff --git a/src/commons/wrt_error.h b/src/commons/wrt_error.h
index 5a1960a..22599f3 100644 (file)
--- a/src/commons/wrt_error.h
+++ b/src/commons/wrt_error.h
@@ -111,8 +111,7 @@ enum WrtError
     WRT_WM_ERR_REMOVE_FILES_FAILED = WRT_WM_ERRCODE + WRT_ERROR_SET(0x0e),
     WRT_WM_ERR_ALREADY_LATEST = WRT_WM_ERRCODE + WRT_ERROR_SET(0x0f),
     WRT_WM_ERR_UPDATE_CANCEL = WRT_WM_ERRCODE + WRT_ERROR_SET(0x10),
-    WRT_WM_ERR_IS_FACTORY_WIDGET = WRT_WM_ERRCODE + WRT_ERROR_SET(0x11),
-    WRT_WM_ERR_INVALID_APP_ID = WRT_WM_ERRCODE + WRT_ERROR_SET(0x12),
+    WRT_WM_ERR_INVALID_APP_ID = WRT_WM_ERRCODE + WRT_ERROR_SET(0x11),
 
     /* Access Control Manager */
     WRT_SAI_ERR_INIT_ACE_FAILED = WRT_SAI_ERRCODE + WRT_ERROR_SET(0x01)

diff --git a/src/jobs/widget_install/widget_install_errors.h b/src/jobs/widget_install/widget_install_errors.h
index cec0242..78480c2 100644 (file)
--- a/src/jobs/widget_install/widget_install_errors.h
+++ b/src/jobs/widget_install/widget_install_errors.h
@@ -37,7 +37,6 @@ enum Type
 
     ErrorInvalidWidgetPackage,       ///< ?
     ErrorWidgetDoesNotExist,         ///< ?
-    ErrorFactoryWidget,              ///< Widget is factory installed, and cannot be uninstalled
     ErrorAreadyUninstalling,         ///< Widget is already being uninstalled
     ErrorOutOfDiskSpace,             ///< ?
     ErrorInvalidPackage,             ///< Widget signature is invalid.

diff --git a/src/jobs/widget_uninstall/widget_uninstall_errors.h b/src/jobs/widget_uninstall/widget_uninstall_errors.h
index f2e1a99..f08d33d 100644 (file)
--- a/src/jobs/widget_uninstall/widget_uninstall_errors.h
+++ b/src/jobs/widget_uninstall/widget_uninstall_errors.h
@@ -33,7 +33,6 @@ enum Type
     Success,
 
     ErrorWidgetDoesNotExist,
-    ErrorFactoryWidget,
     ErrorAlreadyUninstalling,
     ErrorDatabaseFailure,
     ErrorUninstallOspSvcFailed,
@@ -44,7 +43,6 @@ enum Type
 DECLARE_JOB_EXCEPTION_BASE(JobExceptionBase, Base, ErrorUnknown)
 
 DECLARE_JOB_EXCEPTION(Base, DatabaseFailure, ErrorDatabaseFailure)
-DECLARE_JOB_EXCEPTION(Base, FactoryWidget, ErrorFactoryWidget)
 DECLARE_JOB_EXCEPTION(Base, AlreadyUninstalling, ErrorAlreadyUninstalling)
 DECLARE_JOB_EXCEPTION(Base, WidgetNotExist, ErrorWidgetDoesNotExist)
 DECLARE_JOB_EXCEPTION(Base, UninstallOspSvcFailed, ErrorUninstallOspSvcFailed)

diff --git a/src/wrt-installer/installer_callbacks_translate.cpp b/src/wrt-installer/installer_callbacks_translate.cpp
index dfc8586..8571d68 100644 (file)
--- a/src/wrt-installer/installer_callbacks_translate.cpp
+++ b/src/wrt-installer/installer_callbacks_translate.cpp
@@ -106,10 +106,6 @@ void installFinishedCallback(void *userParam,
             errorStatus = WRT_INSTALLER_ERROR_WIDGET_DOES_NOT_EXIST;
             break;
 
-        case Jobs::WidgetInstall::Exceptions::ErrorFactoryWidget:
-            errorStatus = WRT_INSTALLER_ERROR_FACTORY_WIDGET;
-            break;
-
         case Jobs::WidgetInstall::Exceptions::ErrorAreadyUninstalling:
             errorStatus = WRT_INSTALLER_ERROR_ALREADY_UNINSTALLING;
             break;

diff --git a/src/wrt-installer/wrt_installer.cpp b/src/wrt-installer/wrt_installer.cpp
index 4ec29dd..98157b9 100644 (file)
--- a/src/wrt-installer/wrt_installer.cpp
+++ b/src/wrt-installer/wrt_installer.cpp
@@ -619,10 +619,6 @@ void WrtInstaller::staticWrtStatusCallback(std::string tizenId,
                 printf("failed: widget package does not exist\n");
                 break;
 
-            case WRT_INSTALLER_ERROR_FACTORY_WIDGET:
-                printf("failed: factory widget\n");
-                break;
-
             case WRT_INSTALLER_ERROR_ALREADY_UNINSTALLING:
                 printf("failed: already uninstalling\n");
                 break;

diff --git a/src/wrt-installer/wrt_type.h b/src/wrt-installer/wrt_type.h
index 9bc27c0..8e5abb7 100755 (executable)
--- a/src/wrt-installer/wrt_type.h
+++ b/src/wrt-installer/wrt_type.h
@@ -75,8 +75,7 @@ typedef enum
     /* Installer Errors*/
     WRT_INSTALLER_ERROR_INVALID_WIDGET_PACKAGE, /*<  */
     WRT_INSTALLER_ERROR_WIDGET_DOES_NOT_EXIST,  /*<  */
-    WRT_INSTALLER_ERROR_FACTORY_WIDGET,         /*< Widget is factory installed,
-                                                   and cannot be uninstalled */
+
     WRT_INSTALLER_ERROR_ALREADY_UNINSTALLING,   /*< Widget is already being
                                                    uninstalled */
     WRT_INSTALLER_ERROR_OUT_OUT_DISK_SPACE,     /*<  */