From eb0f2465b1226d02fe122731a62f939f5a24ae04 Mon Sep 17 00:00:00 2001 From: Jan Cybulski Date: Wed, 11 Jun 2014 14:20:19 +0200 Subject: [PATCH] Revert "security manager: add generateAppLabel" This revert is due to moving security-manager to separate repository This reverts commit 9843fa406cdd374633e2ef59fadae4aab2555986. Change-Id: I195f03d5096f5a11b9354ff403b0fae0841b577c Signed-off-by: Jan Cybulski --- src/server/CMakeLists.txt | 1 - src/server/service/security-manager-common.cpp | 40 ----------------------- src/server/service/security-manager-common.h | 45 -------------------------- 3 files changed, 86 deletions(-) delete mode 100644 src/server/service/security-manager-common.cpp delete mode 100644 src/server/service/security-manager-common.h diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index c52f61b..2cd6177 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -21,7 +21,6 @@ SET(COMMON_SOURCES ${COMMON_PATH}/dpl/core/src/noncopyable.cpp ${COMMON_PATH}/dpl/core/src/serialization.cpp ${COMMON_PATH}/dpl/core/src/singleton.cpp - ${COMMON_PATH}/service/security-manager-common.cpp ) INCLUDE_DIRECTORIES(SYSTEM diff --git a/src/server/service/security-manager-common.cpp b/src/server/service/security-manager-common.cpp deleted file mode 100644 index 2ae363a..0000000 --- a/src/server/service/security-manager-common.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved - * - * Contact: Rafal Krypa - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ -/** - * @file security-manager-common.cpp - * @author Jan Cybulski - * @version 1.0 - * @brief This file contains implementation of utility functions for security-manager - * - */ - - -#include "security-manager-common.h" - - -namespace SecurityManager { - -bool generateAppLabel(const std::string &appPkgId, std::string &label) -{ - (void) appPkgId; //todo use pkgId to generate label - label = "User"; - return true; -} - -} // namespace SecurityManager - diff --git a/src/server/service/security-manager-common.h b/src/server/service/security-manager-common.h deleted file mode 100644 index 2f1a24b..0000000 --- a/src/server/service/security-manager-common.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved - * - * Contact: Rafal Krypa - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ -/** - * @file security-manager-common.h - * @author Jan Cybulski - * @version 1.0 - * @brief This file is header for utility functions for security-manager - * - */ -#ifndef _SECURITY_MANAGER_COMMON_H_ -#define _SECURITY_MANAGER_COMMON_H_ - -#include - - -namespace SecurityManager { - -/** - * This function generates label for application with package identifier - * read from @ref appPkgId and assigns it to @ref label. - * @param[in] appPkgId application's package identifier. - * @param[out] label string into which application's label will be stored into. - * @return true on success, false on error. - */ -bool generateAppLabel(const std::string &appPkgId, std::string &label); - - -} // namespace SecurityManager - -#endif -- 2.7.4