Removing dependency of ode package.

Change-Id: I1949c64ffc33dbe14e0236aed594b675d97d04c5
Signed-off-by: tarun.mahay <tarun.mahay@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8323923..48deb9a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,6 @@ pkg_check_modules(pkgs REQUIRED
        capi-message-port
        efl-extension
        libsystemd
-       ode
 )
 
 ELSEIF("${TIZEN_PROFILE_NAME}" STREQUAL "WEARABLE")

diff --git a/include/mobile/starter.h b/include/mobile/starter.h
index b973b9d..a9700c2 100644 (file)
--- a/include/mobile/starter.h
+++ b/include/mobile/starter.h
@@ -24,11 +24,4 @@ struct appdata {
        int lcd_status;
 };
 
-enum ODE_PROCESS {
-       BEFORE_LOCKSCREEN = 0,
-       AFTER_LOCKSCREEN,
-};
-
-int starter_execute_ode_process(int booting_state);
-
 #endif                         /* __STARTER_H__ */

diff --git a/packaging/starter.spec b/packaging/starter.spec
index 306f38f..bd987ae 100644 (file)
--- a/packaging/starter.spec
+++ b/packaging/starter.spec
@@ -26,7 +26,6 @@ BuildRequires:  pkgconfig(capi-telephony)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(efl-extension)
 BuildRequires:  pkgconfig(libsystemd)
-BuildRequires:  pkgconfig(ode)
 
 BuildRequires:  pkgconfig(rua)
 BuildRequires:  pkgconfig(feedback)

diff --git a/src/mobile/lock_mgr.c b/src/mobile/lock_mgr.c
index cc82b3e..0a75612 100644 (file)
--- a/src/mobile/lock_mgr.c
+++ b/src/mobile/lock_mgr.c
@@ -31,7 +31,6 @@
 #include <system_settings.h>
 #include <system_info.h>
 #include <telephony.h>
-#include <ode/internal-encryption.h>
 
 #include "lock_mgr.h"
 #include "package_mgr.h"
@@ -247,24 +246,9 @@ static void _other_lockscreen_unlock(void)
 void lock_mgr_unlock(void)
 {
        int ret = 0;
-       int booting_completed = 0;
        int lock_type = status_active_get()->setappl_screen_lock_type_int;
        _D("lock type(%d)", lock_type);
 
-       ret = vconf_get_int(VCONFKEY_STARTER_SEQUENCE, &booting_completed);
-       if (ret != 0) {
-               _E("Failed to get VCONFKEY STARTER SEQUENCE");
-               return;
-       }
-
-       if (!booting_completed) {
-               ret = starter_execute_ode_process(AFTER_LOCKSCREEN);
-               if (!ret) {
-                       _E("Failed to execute ode process");
-                       return;
-               }
-       }
-
        lock_mgr_idle_lock_state_set(VCONFKEY_IDLE_UNLOCK);
        lock_mgr_sound_play(LOCK_SOUND_UNLOCK);
        s_lock_mgr.lock_pid = 0;

diff --git a/src/mobile/starter.c b/src/mobile/starter.c
index 413a6ef..8fe2bb0 100755 (executable)
--- a/src/mobile/starter.c
+++ b/src/mobile/starter.c
@@ -27,7 +27,6 @@
 
 #include <E_DBus.h>
 #include <systemd/sd-daemon.h>
-#include <ode/internal-encryption.h>
 
 #include <aul.h>
 #include <vconf.h>
@@ -242,11 +241,6 @@ static void _init(void)
         */
        _set_starter_sequence(0);
 
-       ret = starter_execute_ode_process(BEFORE_LOCKSCREEN);
-       if (!ret) {
-               _E("Failed to execute ode process");
-       }
-
        aul_listen_app_dead_signal(_check_dead_signal, NULL);
 }
 
@@ -325,50 +319,3 @@ static void _mount_complete_cb(void *user_data)
 {
        _D("Mount is successfully completed");
 }
-
-
-
-int starter_execute_ode_process(int booting_state)
-{
-       _D("This call is before or after Lockscreen: %d", booting_state);
-       int ret = ODE_ERROR_NONE;
-       int ode_state = 0;
-
-       ret = ode_internal_encryption_get_state(&ode_state);
-       if (ret != ODE_ERROR_NONE) {
-               _E("Failed to get ODE state, ret: %d", ret);
-               return 0;
-       }
-
-       if (booting_state == BEFORE_LOCKSCREEN) {
-               if (ode_state == ODE_STATE_ENCRYPTED) {
-                       lock_mgr_init();
-
-                       ret = ode_internal_encryption_set_mount_event_cb(_mount_complete_cb, NULL);
-                       if (ret != ODE_ERROR_NONE) {
-                               _E("Failed to set mount event cb");
-                       }
-               } else {
-                       _launch_apps();
-               }
-       } else if (booting_state == AFTER_LOCKSCREEN) {
-               if (ode_state == ODE_STATE_ENCRYPTED) {
-                       _D("ODE state is: %d, and we should mount at this time", ode_state);
-
-                       ret = ode_internal_encryption_mount();
-                       if (ret != ODE_ERROR_NONE) {
-                               _E("Failed to mount");
-                               return 0;
-                       }
-
-                       sd_notify(0, "READY=1");
-                       home_mgr_init(NULL);
-
-                       vconf_set_int(VCONFKEY_STARTER_SEQUENCE, 1);
-               } else {
-                       _D("ODE state is: %d, Do nothing", ode_state);
-               }
-       }
-
-       return 1;
-}