Do not add the network interface to the bridge.
For all kinds of tethering we want to have a single place
where the interface is added to the bridge to avoid multiple
failure points.
Change-Id: I517e6d00e2953bc5ca008492367c48e3fa18a155
diff --git a/network/Android.mk b/network/Android.mk
index bad7639..703994a 100644
--- a/network/Android.mk
+++ b/network/Android.mk
@@ -14,7 +14,8 @@
LOCAL_CFLAGS:= \
-DVERSION=\"4.69\" \
-DSTORAGEDIR=\"/data/misc/bluetoothd\" \
- -DCONFIGDIR=\"/etc/bluetooth\"
+ -DCONFIGDIR=\"/etc/bluetooth\" \
+ -DANDROID_NO_BRIDGE \
LOCAL_C_INCLUDES:= \
$(LOCAL_PATH)/../btio \
diff --git a/network/server.c b/network/server.c
index 5feb9d0..c29d205 100644
--- a/network/server.c
+++ b/network/server.c
@@ -278,11 +278,13 @@
info("Added new connection: %s", devname);
+#ifndef ANDROID_NO_BRIDGE
if (bnep_add_to_bridge(devname, ns->bridge) < 0) {
error("Can't add %s to the bridge %s: %s(%d)",
devname, ns->bridge, strerror(errno), errno);
return -EPERM;
}
+#endif
bnep_if_up(devname);
