javacommons/security/javasrc.cdc/com/nokia/mj/impl/security/midp/authorization/PermissionGranter.java
--- a/javacommons/security/javasrc.cdc/com/nokia/mj/impl/security/midp/authorization/PermissionGranter.java Wed Jun 23 18:07:10 2010 +0300
+++ b/javacommons/security/javasrc.cdc/com/nokia/mj/impl/security/midp/authorization/PermissionGranter.java Tue Jul 06 14:10:26 2010 +0300
@@ -17,6 +17,7 @@
package com.nokia.mj.impl.security.midp.authorization;
+import com.nokia.mj.impl.utils.Id;
import com.nokia.mj.impl.utils.Uid;
import com.nokia.mj.impl.utils.exception.InvalidAttributeException;
import com.nokia.mj.impl.security.midp.common.MIDPPermission;
@@ -457,7 +458,7 @@
if (permissions_from_sensitive_combination_list_1
&& permissions_from_sensitive_combination_list_2)
{
- String blanketPermissionsDetails = (
+ /*String blanketPermissionsDetails = (
((call_control == true && multimedia == true)
|| (call_control == true && read_user_data == true)
|| (net_access == true && multimedia == true)
@@ -465,7 +466,18 @@
|| (messaging == true && multimedia == true)
|| (messaging == true && read_user_data == true)) ?
"settings_inst_query_perm_net" :
- "settings_inst_query_perm_sec");
+ "settings_inst_query_perm_sec");*/
+
+ Id blanketPermissionsDetails = (
+ ((call_control == true && multimedia == true)
+ || (call_control == true && read_user_data == true)
+ || (net_access == true && multimedia == true)
+ || (net_access == true && read_user_data == true)
+ || (messaging == true && multimedia == true)
+ || (messaging == true && read_user_data == true)) ?
+ new Id("settings_inst_query_perm_net", "N/A") :
+ new Id("settings_inst_query_perm_sec", "N/A"));
+
iBlanketPermissionsDetails.put(msUidKey,
UserSecuritySettingsImpl.getLocalizedString(
blanketPermissionsDetails));