labeling the contents under .mmc

Requires :
        https://review.tizen.org/gerrit/#/c/78145/

Change-Id: Id1892ae218463bcadef99f93f2507b7a98d4fbd5
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>

diff --git a/src/common/external_storage.cc b/src/common/external_storage.cc
index 5b0d757..fbc2eef 100644 (file)
--- a/src/common/external_storage.cc
+++ b/src/common/external_storage.cc
@@ -93,6 +93,9 @@ bool ExternalStorage::Finalize(bool success) {
     break;
   }
   case RequestType::Move: {
+    ret = handle_->interface.client_usr_post_move(pkgid_.c_str(),
+                               static_cast<app2ext_move_type_t>(move_type_),
+                               uid_);
     break;
   }
   default:
@@ -189,9 +192,11 @@ bool ExternalStorage::Initialize(
       break;
     }
 
-    ret = handle_->interface.client_usr_move(pkgid_.c_str(), glist,
-                                     (app2ext_move_type_t)move_type_,
-                                     uid_);
+    ret = handle_->interface.client_usr_disable(pkgid_.c_str(), uid_);
+
+    ret = handle_->interface.client_usr_pre_move(pkgid_.c_str(), glist,
+                               static_cast<app2ext_move_type_t>(move_type_),
+                               uid_);
     break;
   case RequestType::Uninstall:
     ret = handle_->interface.client_usr_pre_uninstall(pkgid_.c_str(), uid_);

diff --git a/src/common/security_registration.cc b/src/common/security_registration.cc
index 8df5d86..2e0ad79 100644 (file)
--- a/src/common/security_registration.cc
+++ b/src/common/security_registration.cc
@@ -36,7 +36,8 @@ const std::vector<std::pair<const char*,
   {"shared/trusted", SECURITY_MANAGER_PATH_TRUSTED_RW},
   {"tep", SECURITY_MANAGER_PATH_RO},
   {".image", SECURITY_MANAGER_PATH_RO},
-  {"tmp", SECURITY_MANAGER_PATH_RW}
+  {"tmp", SECURITY_MANAGER_PATH_RW},
+  {".mmc", SECURITY_MANAGER_PATH_RO}
 };
 
 bool PrepareRequest(const std::string& app_id, const std::string& pkg_id,

diff --git a/src/common/step/filesystem/step_move_installed_storage.cc b/src/common/step/filesystem/step_move_installed_storage.cc
index caab2e0..b85dfa5 100644 (file)
--- a/src/common/step/filesystem/step_move_installed_storage.cc
+++ b/src/common/step/filesystem/step_move_installed_storage.cc
@@ -55,6 +55,12 @@ Step::Status StepMoveInstalledStorage::undo() {
   return Status::OK;
 }
 
+Step::Status StepMoveInstalledStorage::clean() {
+  if (context_->external_storage)
+    context_->external_storage->Commit();
+  return Status::OK;
+}
+
 void StepMoveInstalledStorage::SetTepPaths() {
   old_location_ = context_->manifest_data.get()->tep_name;
   if (context_->is_move_to_external.get()) {

diff --git a/src/common/step/filesystem/step_move_installed_storage.h b/src/common/step/filesystem/step_move_installed_storage.h
index 9bae6d5..a064976 100644 (file)
--- a/src/common/step/filesystem/step_move_installed_storage.h
+++ b/src/common/step/filesystem/step_move_installed_storage.h
@@ -17,7 +17,7 @@ class StepMoveInstalledStorage : public Step {
 
   Status process() override;
 
-  Status clean() override { return Status::OK; }
+  Status clean() override;
   Status undo() override;
   Status precheck() override { return Status::OK; }