Revert "Fixes TIVI-2064"

Handle Settings app privacy in database in %post/%postun scriptlets is no more needed.
Problem is fixed in pkgmgr-info package. Privacies are now inserted in privacy db at
installation time.

This reverts commit fee0ada80e1c0ef9a5002409d21d0eed9e46e51f.

Conflicts:
	packaging/Settings.changes

Change-Id: I6d5d71c47e2c38c78dd9b082aef657ceb27d4dcf
Signed-off-by: Corentin Lecouvey <corentin.lecouvey@open.eurogiciel.org>

diff --git a/packaging/Settings.changes b/packaging/Settings.changes
index 964b30b..b07bde0 100644 (file)
--- a/packaging/Settings.changes
+++ b/packaging/Settings.changes
@@ -1,3 +1,6 @@
+* Fri Jan 24 2014 Corentin Lecouvey <corentin.lecouvey@open.eurogiciel.org> accepted/tizen/ivi/20140110.224142@5cf7f01
+- Revert: Fixes TIVI-2064 - This workaround is no more needed (it was fixed in pkgmgr-info)
+
 * Fri Jan 10 2014 Jimmy Huang <jimmy.huang@intel.com> submit/tizen_ivi_release/20140108.030030@561a602
 - Fixes TIVI-2570 - Unencrypted WiFi connection fails
 

diff --git a/packaging/Settings.spec b/packaging/Settings.spec
index ddcc851..aea0975 100644 (file)
--- a/packaging/Settings.spec
+++ b/packaging/Settings.spec
@@ -10,9 +10,7 @@ BuildRequires:  zip
 BuildRequires:  desktop-file-utils
 Requires:   bluetooth-frwk-core
 Requires:   bluetooth-frwk-service
-Requires:   privacy-manager-server
 Requires:   settingsd
-Requires:   sqlite
 Requires:   wrt-installer
 
 %description
@@ -34,24 +32,11 @@ rm -rf %{buildroot}
 %post
 if [ -f /opt/usr/apps/.preinstallWidgets/preinstallDone ]; then
     wrt-installer -i /opt/usr/apps/.preinstallWidgets/Settings.wgt;
-
-# This is a work around to grant the app privilege to access the privacy APIs
-# Since the pkg manager doesn't install the package information in the privacy database
-# and the privacy-popup is not displaying to allow user to grant access, so for now
-# just manually grant access by updating the privacy database directly
-    sqlite3 /opt/dbspace/.privacy.db "DELETE FROM PackageInfo WHERE PKG_ID='ODBQpKvkS1'";
-    sqlite3 /opt/dbspace/.privacy.db "DELETE FROM PrivacyInfo WHERE PKG_ID='ODBQpKvkS1'";
-    sqlite3 /opt/dbspace/.privacy.db "INSERT INTO PackageInfo(PKG_ID, IS_SET) VALUES('ODBQpKvkS1', 1)";
-    sqlite3 /opt/dbspace/.privacy.db "INSERT INTO PrivacyInfo(PKG_ID, PRIVACY_ID, IS_ENABLED) VALUES('ODBQpKvkS1', 'http://tizen.org/privacy/bluetooth', 1)";
 fi
 
 %postun
 wrt-installer -un ODBQpKvkS1.Settings
 
-# Remove privileges from database when uninstalling
-sqlite3 /opt/dbspace/.privacy.db "DELETE FROM PackageInfo WHERE PKG_ID='ODBQpKvkS1'";
-sqlite3 /opt/dbspace/.privacy.db "DELETE FROM PrivacyInfo WHERE PKG_ID='ODBQpKvkS1'";
-
 %files
 %defattr(-,root,root,-)
 /opt/usr/apps/.preinstallWidgets/Settings.wgt