Fix own_prefix tag duplication issue

In case of org.frwk.gatt_service, owner is different depend on
 gatt relay feature. So, I provide a new conf file for where
 gatt relay feature is not in used.

Change-Id: I3a9bb38afe6d49afd701351a9f19213246eee341

diff --git a/bt-oal/bluez_hal/bluetooth-frwk-gap-agent-no-gatt-relay.conf b/bt-oal/bluez_hal/bluetooth-frwk-gap-agent-no-gatt-relay.conf
new file mode 100644 (file)
index 0000000..e6ade09
--- /dev/null
+++ b/bt-oal/bluez_hal/bluetooth-frwk-gap-agent-no-gatt-relay.conf
@@ -0,0 +1,21 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+    <policy user="root">
+        <allow send_destination_prefix="org.bt.frwk"/>
+        <allow send_destination_prefix="org.frwk.gatt_service"/>
+    </policy>
+    <policy group="network_fw">
+        <allow send_destination_prefix="org.bt.frwk"/>
+        <allow send_destination_prefix="org.frwk.gatt_service"/>
+    </policy>
+    <policy context="default">
+        <deny own_prefix="org.bt.frwk"/>
+        <allow own_prefix="org.bt.frwk"/>
+        <deny send_destination_prefix="org.bt.frwk" send_interface="org.bluez.Profile1"/>
+        <deny own_prefix="org.frwk.gatt_service"/>
+        <allow own_prefix="org.frwk.gatt_service"/>
+        <deny send_destination_prefix="org.frwk.gatt_service" send_interface="org.bluez.GattDescriptor1"/>
+        <deny send_destination_prefix="org.frwk.gatt_service" send_interface="org.bluez.GattCharacteristic1"/>
+    </policy>
+</busconfig>

diff --git a/bt-oal/bluez_hal/bluetooth-frwk-gap-agent.conf b/bt-oal/bluez_hal/bluetooth-frwk-gap-agent.conf
index 0e3f5dd..f577155 100644 (file)
--- a/bt-oal/bluez_hal/bluetooth-frwk-gap-agent.conf
+++ b/bt-oal/bluez_hal/bluetooth-frwk-gap-agent.conf
@@ -2,13 +2,10 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
     <policy user="root">
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
     <policy user="root">

-        <allow own_prefix="org.bt.frwk"/>

         <allow send_destination_prefix="org.bt.frwk"/>
         <allow send_destination_prefix="org.bt.frwk"/>

-        <allow own_prefix="org.frwk.gatt_service"/>

         <allow send_destination_prefix="org.frwk.gatt_service"/>
     </policy>
     <policy group="network_fw">
         <allow send_destination_prefix="org.frwk.gatt_service"/>
     </policy>
     <policy group="network_fw">

-        <allow own_prefix="org.bt.frwk"/>

         <allow send_destination_prefix="org.bt.frwk"/>
         <allow own_prefix="org.frwk.gatt_service"/>
         <allow send_destination_prefix="org.frwk.gatt_service"/>
         <allow send_destination_prefix="org.bt.frwk"/>
         <allow own_prefix="org.frwk.gatt_service"/>
         <allow send_destination_prefix="org.frwk.gatt_service"/>


@@ -18,7 +15,6 @@
         <allow own_prefix="org.bt.frwk"/>
         <deny send_destination_prefix="org.bt.frwk" send_interface="org.bluez.Profile1"/>
         <deny own_prefix="org.frwk.gatt_service"/>
         <allow own_prefix="org.bt.frwk"/>
         <deny send_destination_prefix="org.bt.frwk" send_interface="org.bluez.Profile1"/>
         <deny own_prefix="org.frwk.gatt_service"/>

-        <allow own_prefix="org.frwk.gatt_service"/>

         <deny send_destination_prefix="org.frwk.gatt_service" send_interface="org.bluez.GattDescriptor1"/>
         <deny send_destination_prefix="org.frwk.gatt_service" send_interface="org.bluez.GattCharacteristic1"/>
     </policy>
         <deny send_destination_prefix="org.frwk.gatt_service" send_interface="org.bluez.GattDescriptor1"/>
         <deny send_destination_prefix="org.frwk.gatt_service" send_interface="org.bluez.GattCharacteristic1"/>
     </policy>