From 5b8da2b56697518de5800637a61d7570456e8aa9 Mon Sep 17 00:00:00 2001 From: Zofia Abramowska Date: Fri, 14 Oct 2016 15:09:22 +0200 Subject: [PATCH] SM : Fix ScopedInstaller - use request uid in destructor Change-Id: Ifa6a21d8db5390c2fa64f6d3c4b6b81098d5c767 --- src/security-manager-tests/common/scoped_installer.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/security-manager-tests/common/scoped_installer.h b/src/security-manager-tests/common/scoped_installer.h index 404bd2b..582ea1d 100644 --- a/src/security-manager-tests/common/scoped_installer.h +++ b/src/security-manager-tests/common/scoped_installer.h @@ -36,7 +36,8 @@ class ScopedInstaller { public: ScopedInstaller(const AppInstallHelper &appInstallHelper, bool requestUid = true) - : m_appInstallHelper(appInstallHelper), m_shouldUninstall(true), m_creatorPid(getpid()) + : m_appInstallHelper(appInstallHelper), m_shouldUninstall(true), m_requestUid(requestUid), + m_creatorPid(getpid()) { SecurityManagerTest::InstallRequest instReq; @@ -74,7 +75,8 @@ public: return; SecurityManagerTest::InstallRequest uninstReq; uninstReq.setAppId(m_appInstallHelper.getAppId()); - uninstReq.setUid(m_appInstallHelper.getUID()); + if (m_requestUid) + uninstReq.setUid(m_appInstallHelper.getUID()); SecurityManagerTest::Api::uninstall(uninstReq); m_shouldUninstall = false; @@ -87,5 +89,6 @@ public: protected: AppInstallHelper m_appInstallHelper; bool m_shouldUninstall; + bool m_requestUid; pid_t m_creatorPid; }; -- 2.7.4