javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/rt/installer/ApplicationUtilsImpl.java
--- a/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/rt/installer/ApplicationUtilsImpl.java Wed Aug 18 09:43:15 2010 +0300
+++ b/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/rt/installer/ApplicationUtilsImpl.java Thu Sep 02 20:20:40 2010 +0300
@@ -173,7 +173,9 @@
{
if (iSilent)
{
- // Do not prompt the user in case of silent installation.
+ // Do not prompt the user in case of silent installation
+ // -> don't enforce security, just query the permission
+ // to see if it is not allowed
int permissionResult =
iAccessController.checkPermission(aPermission.toString());
Log.log("ApplicationUtilsImpl.checkPermission: appUid: " +
@@ -188,7 +190,8 @@
}
else
{
- // Not a silent installation, display user prompt.
+ // Not a silent installation -> enforce security (an user
+ // prompt might be displayed)
iAccessController.checkPermission(aPermission);
Log.log("ApplicationUtilsImpl.checkPermission: appUid: " +
aAppUid + ", " + aPermission.toString() + " ok");
@@ -196,15 +199,17 @@
}
else
{
- // No user prompt allowed for this permission.
+ // No user prompt allowed for this permission -> don't enforce
+ // security, just query the permission to see if it is not
+ // allowed
int permissionResult =
iAccessController.checkPermission(aPermission.toString());
Log.log("ApplicationUtilsImpl.checkPermission: appUid: " +
aAppUid + ", " + aPermission.toString() +
" result " + permissionResult);
- if (permissionResult <= 0)
+ if (permissionResult == 0)
{
- // Permission is either denied or requires user prompt.
+ // Permission is denied
throw new AccessControlException(
"Permission " + aPermission.toString() + " not allowed");
}