diff options
| author | Jiwoong Im <jiwoong.im@samsung.com> | 2016-12-29 18:36:25 +0900 |
|---|---|---|
| committer | Jiwoong Im <jiwoong.im@samsung.com> | 2017-01-05 07:47:40 +0900 |
| commit | f2e4e90f44dfc3d9ce6701bf7c907a9f18f354b8 (patch) | |
| tree | 5ad93d607321601bfc4981f2d6571d2482c9d57d | |
| parent | ae0a3c002eb2a668a124c166568900058cdcc852 (diff) | |
| download | alarm-manager-f2e4e90f44dfc3d9ce6701bf7c907a9f18f354b8.tar.gz alarm-manager-f2e4e90f44dfc3d9ce6701bf7c907a9f18f354b8.tar.bz2 alarm-manager-f2e4e90f44dfc3d9ce6701bf7c907a9f18f354b8.zip | |
Fix bug in alarmmgr_finisubmit/tizen/20170112.062520accepted/tizen/wearable/20170112.222929accepted/tizen/tv/20170112.222913accepted/tizen/mobile/20170112.222856accepted/tizen/ivi/20170112.222949accepted/tizen/common/20170112.174805
- Some finalize step for session bus connection is missing.
Change-Id: Iaf033059e35efcdedadab05bb8e305825086b0c1
Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>
| -rw-r--r-- | src/alarm-lib.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/alarm-lib.c b/src/alarm-lib.c index f721c8a..01e7325 100644 --- a/src/alarm-lib.c +++ b/src/alarm-lib.c @@ -596,13 +596,20 @@ error: EXPORT_API void alarmmgr_fini() { SECURE_LOGD("Enter"); + bool is_user = false; + + if (getuid() >= REGULAR_UID_MIN) + is_user = true; + if (introspection_data) { g_dbus_node_info_unref(introspection_data); introspection_data = NULL; } - if (alarm_context.connection != NULL && registration_id != 0) { - g_dbus_connection_unregister_object(alarm_context.connection, registration_id); + if (registration_id != 0) { + g_dbus_connection_unregister_object(is_user ? + alarm_context.session_conn : alarm_context.connection, + registration_id); registration_id = 0; } @@ -616,7 +623,7 @@ EXPORT_API void alarmmgr_fini() alarm_context.connection = NULL; } - if (alarm_context.connection) { + if (alarm_context.session_conn) { g_object_unref(alarm_context.session_conn); alarm_context.session_conn = NULL; } |