Fix find group error

Change-Id: I6ea6f999c04f8e7fb91a9b90c443f263b2304dc3

diff --git a/packaging/capmgr.service b/packaging/capmgr.service
index aa8db67c555fd6bb820ff5c2dd176e955ca4532d..95b78804610ee7b9120580137b90b4d36006713f 100644 (file)
--- a/packaging/capmgr.service
+++ b/packaging/capmgr.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Capability Manager
 Requires=dbus.socket
-After=dbus.socket
+After=Network.target dbus.socket
 
 [Service]
 User=app_fw

diff --git a/src/common/mdg_manager.cc b/src/common/mdg_manager.cc
index e441bf16ccf5bf164ef2e96526f01d4dce543101..7bf88634a70830e929fb6b85b388eeec822bfc79 100644 (file)
--- a/src/common/mdg_manager.cc
+++ b/src/common/mdg_manager.cc
@@ -299,6 +299,10 @@ bool MDGManager::GroupFoundCb(mdg_group_type_e type, mdg_group_h group,
 void MDGManager::GroupFinishCb(int result, void* user_data) {
   LOG(INFO) << "Find group finished: " << result;
   MDGManager* mdgmgr = static_cast<MDGManager*>(user_data);
+  if (mdgmgr->group_handle_ == nullptr) {
+    LOG(ERROR) << "No group exists";
+    return;
+  }
   int ret = mdg_group_foreach_device(mdgmgr->mdg_handle_, mdgmgr->group_handle_,
       &MDGManager::GroupForeachCb, user_data);
   if (ret != MDG_ERROR_NONE)